diff --git a/CMakeLists.txt b/CMakeLists.txt
index d797f92375..c4cb606b9c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,72 +1,72 @@
-project(kdevclangtidy)
+project(kdev-clangtidy)
 
 set(VERSION_MAJOR 0)
 set(VERSION_MINOR 0)
 set(VERSION_PATCH 1)
 # KDevplatform dependency version
 set(KDEVPLATFORM_VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
 
 cmake_minimum_required(VERSION 2.8.12)
 find_package (ECM 0.0.9 REQUIRED NO_MODULE)
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH})
 
 include(ECMAddTests)
 include(KDEInstallDirs)
 include(KDECMakeSettings)
 include(KDECompilerSettings)
 include(FeatureSummary)
 
 find_package(Qt5 REQUIRED Core Widgets Test)
 find_package(KF5 REQUIRED COMPONENTS IconThemes ItemModels ThreadWeaver TextEditor I18n)
 find_package(KDevPlatform ${KDEVPLATFORM_VERSION} REQUIRED)
 
 set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH})
 
 include_directories(
     ${kdevclangtidy_BINARY_DIR}
     ${kdevclangtidy_SOURCE_DIR}/src
 )
 
 set(kdevclangtidy_PART_SRCS
     src/debug.cpp
     src/job.cpp
     src/plugin.cpp
 
     src/config/configgroup.cpp
     src/config/perprojectconfigpage.cpp
     src/config/clangtidypreferences.cpp
 
     src/parsers/clangtidyparser.cpp
     src/parsers/replacementparser.cpp
 )
 
 include (cmake/ClangFormatAll.cmake)
 
 ki18n_wrap_ui(kdevclangtidy_PART_SRCS ${kdevclangtidy_PART_UI}
     src/config/clangtidypreferences.ui
     src/config/perprojectconfig.ui
 )
-kconfig_add_kcfg_files(kdevclangtidy_PART_SRCS res/clangtidyconfig.kcfgc)
-kdevplatform_add_plugin(kdevclangtidy JSON res/kdevclangtidy.json SOURCES 
+kconfig_add_kcfg_files(kdevclangtidy_PART_SRCS src/config/clangtidyconfig.kcfgc)
+kdevplatform_add_plugin(kdevclangtidy JSON kdevclangtidy.json SOURCES
 ${kdevclangtidy_PART_SRCS} ${kdevclangtidy_CONFIG_SRCS})
 target_link_libraries(kdevclangtidy
     KDev::Interfaces
     KDev::Project
     KDev::Language
     KDev::OutputView
     KDev::Util
     KDev::Shell
     KF5::ConfigCore
     KF5::IconThemes
     KF5::KIOCore
     KF5::WidgetsAddons
     KF5::TextEditor
     Qt5::Network
     )
 
-install(FILES res/kdevclangtidy.rc DESTINATION ${KXMLGUI_INSTALL_DIR}/kdevclangtidy)
+install(FILES kdevclangtidy.rc DESTINATION ${KXMLGUI_INSTALL_DIR}/kdevclangtidy)
 
 add_subdirectory(tests)
 
 feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
 
diff --git a/res/Messages.sh b/Messages.sh
similarity index 100%
rename from res/Messages.sh
rename to Messages.sh
diff --git a/res/kdevclangtidy.json b/kdevclangtidy.json
similarity index 100%
rename from res/kdevclangtidy.json
rename to kdevclangtidy.json
diff --git a/res/kdevclangtidy.rc b/kdevclangtidy.rc
similarity index 100%
rename from res/kdevclangtidy.rc
rename to kdevclangtidy.rc
diff --git a/res/clangtidyconfig.kcfg b/src/config/clangtidyconfig.kcfg
similarity index 100%
rename from res/clangtidyconfig.kcfg
rename to src/config/clangtidyconfig.kcfg
diff --git a/res/clangtidyconfig.kcfgc b/src/config/clangtidyconfig.kcfgc
similarity index 100%
rename from res/clangtidyconfig.kcfgc
rename to src/config/clangtidyconfig.kcfgc