build: search headers in all source directories

* removed paths in include directives
* changed cmake to provide necessary header search paths
* changed name of version.h to productVersion.h due to name conflict

src/app/CMakeLists.txt

@@ -1,5 +1,5 @@
 add_files(
-	APP_FILES
+	APP
 
 	main.cpp
 )

src/app/main.cpp

@@ -1,4 +1,4 @@
-#include "includes.h" // defines 'void setup(int argc, char *argv[])'
+#include "includes.h"
 
 #include <csignal>
 
@@ -6,34 +6,34 @@
 #include "LanguagePackageCxx.h"
 #include "LanguagePackageJava.h"
 #include "LanguagePackageManager.h"
-#include "project/SourceGroupFactory.h"
-#include "project/SourceGroupFactoryModuleCxx.h"
-#include "project/SourceGroupFactoryModuleJava.h"
-#include "qt/network/QtNetworkFactory.h"
-#include "qt/QtApplication.h"
-#include "qt/QtCoreApplication.h"
-#include "qt/utility/utilityQt.h"
-#include "qt/view/QtViewFactory.h"
-#include "qt/window/QtEulaWindow.h"
-#include "settings/ApplicationSettings.h"
-#include "utility/commandline/CommandLineParser.h"
-#include "utility/logging/ConsoleLogger.h"
-#include "utility/logging/FileLogger.h"
-#include "utility/logging/logging.h"
-#include "utility/logging/LogManager.h"
-#include "utility/messaging/type/MessageInterruptTasks.h"
-#include "utility/messaging/type/MessageLoadProject.h"
-#include "utility/messaging/type/MessageStatus.h"
-#include "utility/ResourcePaths.h"
-#include "utility/ScopedFunctor.h"
-#include "utility/text/TextAccess.h"
-#include "utility/UserPaths.h"
-#include "utility/utility.h"
-#include "utility/utilityApp.h"
-#include "utility/utilityCxx.h"
-#include "utility/utilityPathDetection.h"
-#include "utility/Version.h"
-#include "version.h"
+#include "SourceGroupFactory.h"
+#include "SourceGroupFactoryModuleCxx.h"
+#include "SourceGroupFactoryModuleJava.h"
+#include "QtNetworkFactory.h"
+#include "QtApplication.h"
+#include "QtCoreApplication.h"
+#include "utilityQt.h"
+#include "QtViewFactory.h"
+#include "QtEulaWindow.h"
+#include "ApplicationSettings.h"
+#include "CommandLineParser.h"
+#include "ConsoleLogger.h"
+#include "FileLogger.h"
+#include "logging.h"
+#include "LogManager.h"
+#include "MessageInterruptTasks.h"
+#include "MessageLoadProject.h"
+#include "MessageStatus.h"
+#include "ResourcePaths.h"
+#include "ScopedFunctor.h"
+#include "TextAccess.h"
+#include "UserPaths.h"
+#include "utility.h"
+#include "utilityApp.h"
+#include "utilityCxx.h"
+#include "utilityPathDetection.h"
+#include "Version.h"
+#include "productVersion.h"
 
 void signalHandler(int signum)
 {

src/external/CMakeLists.txt

@@ -1,5 +1,5 @@
 add_files(
-	EXTERNAL_FILES
+	EXTERNAL
 
 	sqlite/CppSQLite3.cpp
 	sqlite/CppSQLite3.h
@@ -13,7 +13,7 @@ add_files(
 )
 
 add_files(
-	EXTERNAL_C_FILES
+	EXTERNAL_C
 
 	sqlite/sqlite3.c
 	sqlite/sqlite3.h

src/indexer/CMakeLists.txt

@@ -1,5 +1,5 @@
 add_files(
-	INDEXER_FILES
+	INDEXER
 
 	main.cpp
 )

src/indexer/main.cpp

@@ -3,13 +3,13 @@
 #include "LanguagePackageCxx.h"
 #include "LanguagePackageJava.h"
 #include "LanguagePackageManager.h"
-#include "data/indexer/interprocess/InterprocessIndexer.h"
-#include "settings/ApplicationSettings.h"
-#include "utility/AppPath.h"
-#include "utility/logging/ConsoleLogger.h"
-#include "utility/logging/FileLogger.h"
-#include "utility/logging/logging.h"
-#include "utility/logging/LogManager.h"
+#include "InterprocessIndexer.h"
+#include "ApplicationSettings.h"
+#include "AppPath.h"
+#include "ConsoleLogger.h"
+#include "FileLogger.h"
+#include "logging.h"
+#include "LogManager.h"
 
 void setupLogging(const FilePath& logFilePath)
 {

src/lib/Application.cpp

@@ -1,33 +1,33 @@
 #include "Application.h"
 
-#include "component/controller/IDECommunicationController.h"
-#include "component/NetworkFactory.h"
-#include "component/view/DialogView.h"
-#include "component/view/GraphViewStyle.h"
-#include "component/view/MainView.h"
-#include "component/view/ViewFactory.h"
-#include "data/storage/StorageCache.h"
+#include "IDECommunicationController.h"
+#include "NetworkFactory.h"
+#include "DialogView.h"
+#include "GraphViewStyle.h"
+#include "MainView.h"
+#include "ViewFactory.h"
+#include "StorageCache.h"
 #include "LicenseChecker.h"
-#include "settings/ApplicationSettings.h"
-#include "settings/ProjectSettings.h"
-#include "settings/ColorScheme.h"
-#include "utility/file/FileSystem.h"
-#include "utility/interprocess/SharedMemoryGarbageCollector.h"
-#include "utility/logging/logging.h"
-#include "utility/logging/LogManager.h"
-#include "utility/messaging/filter_types/MessageFilterErrorCountUpdate.h"
-#include "utility/messaging/filter_types/MessageFilterFocusInOut.h"
-#include "utility/messaging/filter_types/MessageFilterSearchAutocomplete.h"
-#include "utility/messaging/MessageQueue.h"
-#include "utility/messaging/type/MessageForceEnterLicense.h"
-#include "utility/messaging/type/MessageQuitApplication.h"
-#include "utility/messaging/type/MessageStatus.h"
-#include "utility/scheduling/TaskScheduler.h"
-#include "utility/tracing.h"
-#include "utility/UserPaths.h"
-#include "utility/utilityString.h"
-#include "utility/utilityUuid.h"
-#include "utility/Version.h"
+#include "ApplicationSettings.h"
+#include "ProjectSettings.h"
+#include "ColorScheme.h"
+#include "FileSystem.h"
+#include "SharedMemoryGarbageCollector.h"
+#include "logging.h"
+#include "LogManager.h"
+#include "MessageFilterErrorCountUpdate.h"
+#include "MessageFilterFocusInOut.h"
+#include "MessageFilterSearchAutocomplete.h"
+#include "MessageQueue.h"
+#include "MessageForceEnterLicense.h"
+#include "MessageQuitApplication.h"
+#include "MessageStatus.h"
+#include "TaskScheduler.h"
+#include "tracing.h"
+#include "UserPaths.h"
+#include "utilityString.h"
+#include "utilityUuid.h"
+#include "Version.h"
 #include "UpdateChecker.h"
 
 std::shared_ptr<Application> Application::s_instance;

src/lib/Application.h

@@ -3,16 +3,16 @@
 
 #include <memory>
 
-#include "component/ComponentManager.h"
-#include "project/Project.h"
-#include "utility/messaging/MessageListener.h"
-#include "utility/messaging/type/indexing/MessageIndexingFinished.h"
-#include "utility/messaging/type/MessageActivateWindow.h"
-#include "utility/messaging/type/MessageEnteredLicense.h"
-#include "utility/messaging/type/MessageLoadProject.h"
-#include "utility/messaging/type/MessageRefresh.h"
-#include "utility/messaging/type/MessageSwitchColorScheme.h"
-#include "utility/messaging/type/MessageWindowFocus.h"
+#include "ComponentManager.h"
+#include "Project.h"
+#include "MessageListener.h"
+#include "MessageIndexingFinished.h"
+#include "MessageActivateWindow.h"
+#include "MessageEnteredLicense.h"
+#include "MessageLoadProject.h"
+#include "MessageRefresh.h"
+#include "MessageSwitchColorScheme.h"
+#include "MessageWindowFocus.h"
 
 class Bookmark;
 class DialogView;

src/lib/CMakeLists.txt

@@ -1,6 +1,6 @@
 
 add_files(
-	LIB_FILES
+	LIB
 
 	component/controller/helper/BucketLayouter.cpp
 	component/controller/helper/BucketLayouter.h
@@ -424,6 +424,8 @@ add_files(
 	utility/messaging/filter_types/MessageFilterFocusInOut.h
 	utility/messaging/filter_types/MessageFilterSearchAutocomplete.h
 
+	utility/messaging/type/activation/MessageActivateLegend.h
+	
 	utility/messaging/type/code/MessageCodeShowDefinition.h
 
 	utility/messaging/type/error/MessageActivateErrors.h

src/lib/LanguagePackageManager.cpp

@@ -1,6 +1,6 @@
 #include "LanguagePackageManager.h"
 
-#include "data/indexer/IndexerComposite.h"
+#include "IndexerComposite.h"
 #include "LanguagePackage.h"
 
 std::shared_ptr<LanguagePackageManager> LanguagePackageManager::getInstance()

src/lib/LicenseChecker.cpp

@@ -1,13 +1,13 @@
 #include "LicenseChecker.h"
 
-#include "utility/AppPath.h"
-#include "utility/logging/logging.h"
-#include "utility/utilityApp.h"
-#include "utility/messaging/type/MessageForceEnterLicense.h"
+#include "AppPath.h"
+#include "logging.h"
+#include "utilityApp.h"
+#include "MessageForceEnterLicense.h"
 
 #include "License.h"
 #include "PublicKey.h"
-#include "settings/ApplicationSettings.h"
+#include "ApplicationSettings.h"
 
 void LicenseChecker::createInstance()
 {

src/lib/LicenseChecker.h

@@ -1,7 +1,7 @@
 #ifndef LICENSE_CHECKER_H
 #define LICENSE_CHECKER_H
 
-#include "utility/messaging/type/MessageEnteredLicense.h"
+#include "MessageEnteredLicense.h"
 
 class License;
 

src/lib/component/Component.cpp

@@ -1,7 +1,7 @@
-#include "component/Component.h"
+#include "Component.h"
 
-#include "component/view/View.h"
-#include "component/controller/Controller.h"
+#include "View.h"
+#include "Controller.h"
 
 Component::Component(std::shared_ptr<View> view, std::shared_ptr<Controller> controller)
 	: m_controller(controller)

src/lib/component/ComponentFactory.cpp

@@ -1,29 +1,29 @@
-#include "component/ComponentFactory.h"
+#include "ComponentFactory.h"
 
-#include "component/Component.h"
-#include "component/controller/ActivationController.h"
-#include "component/controller/BookmarkController.h"
-#include "component/controller/CodeController.h"
-#include "component/controller/ErrorController.h"
-#include "component/controller/GraphController.h"
-#include "component/controller/RefreshController.h"
-#include "component/controller/ScreenSearchController.h"
-#include "component/controller/SearchController.h"
-#include "component/controller/StatusBarController.h"
-#include "component/controller/StatusController.h"
-#include "component/controller/TooltipController.h"
-#include "component/controller/UndoRedoController.h"
-#include "component/view/BookmarkView.h"
-#include "component/view/CodeView.h"
-#include "component/view/ErrorView.h"
-#include "component/view/RefreshView.h"
-#include "component/view/ScreenSearchView.h"
-#include "component/view/SearchView.h"
-#include "component/view/StatusBarView.h"
-#include "component/view/StatusView.h"
-#include "component/view/TooltipView.h"
-#include "component/view/UndoRedoView.h"
-#include "component/view/ViewFactory.h"
+#include "Component.h"
+#include "ActivationController.h"
+#include "BookmarkController.h"
+#include "CodeController.h"
+#include "ErrorController.h"
+#include "GraphController.h"
+#include "RefreshController.h"
+#include "ScreenSearchController.h"
+#include "SearchController.h"
+#include "StatusBarController.h"
+#include "StatusController.h"
+#include "TooltipController.h"
+#include "UndoRedoController.h"
+#include "BookmarkView.h"
+#include "CodeView.h"
+#include "ErrorView.h"
+#include "RefreshView.h"
+#include "ScreenSearchView.h"
+#include "SearchView.h"
+#include "StatusBarView.h"
+#include "StatusView.h"
+#include "TooltipView.h"
+#include "UndoRedoView.h"
+#include "ViewFactory.h"
 
 std::shared_ptr<ComponentFactory> ComponentFactory::create(ViewFactory* viewFactory, StorageAccess* storageAccess)
 {

src/lib/component/ComponentFactory.h

@@ -3,7 +3,7 @@
 
 #include <memory>
 
-#include "data/access/StorageAccess.h"
+#include "StorageAccess.h"
 
 class Component;
 class ViewFactory;

src/lib/component/ComponentManager.cpp

@@ -1,13 +1,13 @@
-#include "component/ComponentManager.h"
+#include "ComponentManager.h"
 
-#include "utility/logging/logging.h"
+#include "logging.h"
 
-#include "component/controller/Controller.h"
-#include "component/controller/ScreenSearchController.h"
-#include "component/view/CompositeView.h"
-#include "component/view/DialogView.h"
-#include "component/view/TabbedView.h"
-#include "component/view/ViewFactory.h"
+#include "Controller.h"
+#include "ScreenSearchController.h"
+#include "CompositeView.h"
+#include "DialogView.h"
+#include "TabbedView.h"
+#include "ViewFactory.h"
 
 std::shared_ptr<ComponentManager> ComponentManager::create(ViewFactory* viewFactory, StorageAccess* storageAccess)
 {

src/lib/component/ComponentManager.h

@@ -4,9 +4,9 @@
 #include <memory>
 #include <vector>
 
-#include "component/Component.h"
-#include "component/ComponentFactory.h"
-#include "component/view/DialogView.h"
+#include "Component.h"
+#include "ComponentFactory.h"
+#include "DialogView.h"
 
 class CompositeView;
 class DialogView;

src/lib/component/NetworkFactory.cpp

@@ -1,4 +1,4 @@
-#include "component/NetworkFactory.h"
+#include "NetworkFactory.h"
 
 NetworkFactory::NetworkFactory()
 {

src/lib/component/controller/ActivationController.cpp

@@ -1,18 +1,18 @@
-#include "component/controller/ActivationController.h"
+#include "ActivationController.h"
 
-#include "data/access/StorageAccess.h"
-#include "settings/ApplicationSettings.h"
+#include "StorageAccess.h"
+#include "ApplicationSettings.h"
 
-#include "utility/messaging/type/activation/MessageActivateLegend.h"
-#include "utility/messaging/type/error/MessageErrorsAll.h"
-#include "utility/messaging/type/MessageActivateAll.h"
-#include "utility/messaging/type/MessageActivateTokens.h"
-#include "utility/messaging/type/MessageChangeFileView.h"
-#include "utility/messaging/type/MessageFlushUpdates.h"
-#include "utility/messaging/type/MessageRefresh.h"
-#include "utility/messaging/type/MessageStatus.h"
-#include "utility/messaging/type/MessageScrollToLine.h"
-#include "utility/utility.h"
+#include "MessageActivateLegend.h"
+#include "MessageErrorsAll.h"
+#include "MessageActivateAll.h"
+#include "MessageActivateTokens.h"
+#include "MessageChangeFileView.h"
+#include "MessageFlushUpdates.h"
+#include "MessageRefresh.h"
+#include "MessageStatus.h"
+#include "MessageScrollToLine.h"
+#include "utility.h"
 
 ActivationController::ActivationController(StorageAccess* storageAccess)
 	: m_storageAccess(storageAccess)

src/lib/component/controller/ActivationController.h

@@ -3,17 +3,17 @@
 
 #include <memory>
 
-#include "component/controller/Controller.h"
+#include "Controller.h"
 
-#include "utility/messaging/MessageListener.h"
-#include "utility/messaging/type/MessageActivateEdge.h"
-#include "utility/messaging/type/MessageActivateFile.h"
-#include "utility/messaging/type/MessageActivateNodes.h"
-#include "utility/messaging/type/MessageActivateTokenIds.h"
-#include "utility/messaging/type/MessageActivateSourceLocations.h"
-#include "utility/messaging/type/MessageResetZoom.h"
-#include "utility/messaging/type/MessageSearch.h"
-#include "utility/messaging/type/MessageZoom.h"
+#include "MessageListener.h"
+#include "MessageActivateEdge.h"
+#include "MessageActivateFile.h"
+#include "MessageActivateNodes.h"
+#include "MessageActivateTokenIds.h"
+#include "MessageActivateSourceLocations.h"
+#include "MessageResetZoom.h"
+#include "MessageSearch.h"
+#include "MessageZoom.h"
 
 class StorageAccess;
 

src/lib/component/controller/BookmarkController.cpp

@@ -1,18 +1,18 @@
 #include "BookmarkController.h"
 
 #include "Application.h"
-#include "component/view/BookmarkView.h"
-#include "data/access/StorageAccess.h"
-#include "data/bookmark/Bookmark.h"
-#include "data/bookmark/EdgeBookmark.h"
-#include "data/bookmark/NodeBookmark.h"
-#include "data/storage/type/StorageEdge.h"
+#include "BookmarkView.h"
+#include "StorageAccess.h"
+#include "Bookmark.h"
+#include "EdgeBookmark.h"
+#include "NodeBookmark.h"
+#include "StorageEdge.h"
 
-#include "utility/messaging/type/MessageActivateEdge.h"
-#include "utility/messaging/type/MessageActivateNodes.h"
-#include "utility/logging/logging.h"
-#include "utility/utilityString.h"
-#include "utility/utility.h"
+#include "MessageActivateEdge.h"
+#include "MessageActivateNodes.h"
+#include "logging.h"
+#include "utilityString.h"
+#include "utility.h"
 
 const std::wstring BookmarkController::s_edgeSeperatorToken = L" => ";
 const std::wstring BookmarkController::s_defaultCategoryName = L"default";

src/lib/component/controller/BookmarkController.h

@@ -1,20 +1,20 @@
 #ifndef BOOKMARK_CONTROLLER_H
 #define BOOKMARK_CONTROLLER_H
 
-#include "data/bookmark/Bookmark.h"
-#include "data/bookmark/NodeBookmark.h"
-#include "data/bookmark/EdgeBookmark.h"
+#include "Bookmark.h"
+#include "NodeBookmark.h"
+#include "EdgeBookmark.h"
 
-#include "utility/messaging/MessageListener.h"
-#include "utility/messaging/type/error/MessageActivateErrors.h"
-#include "utility/messaging/type/indexing/MessageIndexingFinished.h"
-#include "utility/messaging/type/MessageActivateAll.h"
-#include "utility/messaging/type/MessageActivateBookmark.h"
-#include "utility/messaging/type/MessageActivateTokens.h"
-#include "utility/messaging/type/MessageDisplayBookmarkCreator.h"
-#include "utility/messaging/type/MessageDisplayBookmarks.h"
+#include "MessageListener.h"
+#include "MessageActivateErrors.h"
+#include "MessageIndexingFinished.h"
+#include "MessageActivateAll.h"
+#include "MessageActivateBookmark.h"
+#include "MessageActivateTokens.h"
+#include "MessageDisplayBookmarkCreator.h"
+#include "MessageDisplayBookmarks.h"
 
-#include "component/controller/Controller.h"
+#include "Controller.h"
 
 class StorageAccess;
 

src/lib/component/controller/CodeController.cpp

@@ -1,18 +1,18 @@
-#include "component/controller/CodeController.h"
+#include "CodeController.h"
 
 #include <memory>
 
-#include "data/access/StorageAccess.h"
-#include "data/location/SourceLocation.h"
-#include "data/location/SourceLocationCollection.h"
-#include "data/location/SourceLocationFile.h"
-#include "settings/ApplicationSettings.h"
-#include "utility/file/FileInfo.h"
-#include "utility/logging/logging.h"
-#include "utility/messaging/type/MessageStatus.h"
-#include "utility/text/TextAccess.h"
-#include "utility/tracing.h"
-#include "utility/utilityString.h"
+#include "StorageAccess.h"
+#include "SourceLocation.h"
+#include "SourceLocationCollection.h"
+#include "SourceLocationFile.h"
+#include "ApplicationSettings.h"
+#include "FileInfo.h"
+#include "logging.h"
+#include "MessageStatus.h"
+#include "TextAccess.h"
+#include "tracing.h"
+#include "utilityString.h"
 #include "Application.h"
 
 CodeController::CodeController(StorageAccess* storageAccess)

src/lib/component/controller/CodeController.h

@@ -4,31 +4,31 @@
 #include <map>
 #include <string>
 
-#include "utility/file/FilePath.h"
-#include "utility/messaging/MessageListener.h"
-#include "utility/messaging/type/activation/MessageActivateLegend.h"
-#include "utility/messaging/type/code/MessageCodeShowDefinition.h"
-#include "utility/messaging/type/error/MessageActivateErrors.h"
-#include "utility/messaging/type/error/MessageErrorCountClear.h"
-#include "utility/messaging/type/error/MessageShowError.h"
-#include "utility/messaging/type/MessageActivateAll.h"
-#include "utility/messaging/type/MessageActivateFullTextSearch.h"
-#include "utility/messaging/type/MessageActivateLocalSymbols.h"
-#include "utility/messaging/type/MessageActivateTokens.h"
-#include "utility/messaging/type/MessageActivateTrailEdge.h"
-#include "utility/messaging/type/MessageChangeFileView.h"
-#include "utility/messaging/type/MessageDeactivateEdge.h"
-#include "utility/messaging/type/MessageFlushUpdates.h"
-#include "utility/messaging/type/MessageFocusIn.h"
-#include "utility/messaging/type/MessageFocusOut.h"
-#include "utility/messaging/type/MessageScrollCode.h"
-#include "utility/messaging/type/MessageScrollToLine.h"
-#include "utility/messaging/type/MessageShowScope.h"
-#include "utility/types.h"
+#include "FilePath.h"
+#include "MessageListener.h"
+#include "MessageActivateLegend.h"
+#include "MessageCodeShowDefinition.h"
+#include "MessageActivateErrors.h"
+#include "MessageErrorCountClear.h"
+#include "MessageShowError.h"
+#include "MessageActivateAll.h"
+#include "MessageActivateFullTextSearch.h"
+#include "MessageActivateLocalSymbols.h"
+#include "MessageActivateTokens.h"
+#include "MessageActivateTrailEdge.h"
+#include "MessageChangeFileView.h"
+#include "MessageDeactivateEdge.h"
+#include "MessageFlushUpdates.h"
+#include "MessageFocusIn.h"
+#include "MessageFocusOut.h"
+#include "MessageScrollCode.h"
+#include "MessageScrollToLine.h"
+#include "MessageShowScope.h"
+#include "types.h"
 
-#include "component/controller/helper/SnippetMerger.h"
-#include "component/controller/Controller.h"
-#include "component/view/CodeView.h"
+#include "SnippetMerger.h"
+#include "Controller.h"
+#include "CodeView.h"
 
 class StorageAccess;
 class SourceLocation;

src/lib/component/controller/Controller.h

@@ -1,7 +1,7 @@
 #ifndef CONTROLLER_H
 #define CONTROLLER_H
 
-#include "component/Component.h"
+#include "Component.h"
 
 class Controller
 {

src/lib/component/controller/ErrorController.cpp

@@ -1,10 +1,10 @@
-#include "component/controller/ErrorController.h"
+#include "ErrorController.h"
 
 #include "Application.h"
-#include "component/view/DialogView.h"
-#include "data/access/StorageAccess.h"
-#include "project/Project.h"
-#include "settings/ApplicationSettings.h"
+#include "DialogView.h"
+#include "StorageAccess.h"
+#include "Project.h"
+#include "ApplicationSettings.h"
 
 ErrorController::ErrorController(StorageAccess* storageAccess)
 	: m_storageAccess(storageAccess)

src/lib/component/controller/ErrorController.h

@@ -1,22 +1,22 @@
 #ifndef ERROR_CONTROLLER_H
 #define ERROR_CONTROLLER_H
 
-#include "utility/messaging/MessageListener.h"
-#include "utility/messaging/type/error/MessageActivateErrors.h"
-#include "utility/messaging/type/error/MessageErrorCountClear.h"
-#include "utility/messaging/type/error/MessageErrorCountUpdate.h"
-#include "utility/messaging/type/error/MessageErrorsAll.h"
-#include "utility/messaging/type/error/MessageErrorsForFile.h"
-#include "utility/messaging/type/error/MessageErrorsHelpMessage.h"
-#include "utility/messaging/type/error/MessageShowError.h"
-#include "utility/messaging/type/indexing/MessageIndexingFinished.h"
-#include "utility/messaging/type/indexing/MessageIndexingStarted.h"
-#include "utility/messaging/type/MessageActivateAll.h"
-#include "utility/messaging/type/MessageActivateFullTextSearch.h"
-#include "utility/messaging/type/MessageActivateTokens.h"
+#include "MessageListener.h"
+#include "MessageActivateErrors.h"
+#include "MessageErrorCountClear.h"
+#include "MessageErrorCountUpdate.h"
+#include "MessageErrorsAll.h"
+#include "MessageErrorsForFile.h"
+#include "MessageErrorsHelpMessage.h"
+#include "MessageShowError.h"
+#include "MessageIndexingFinished.h"
+#include "MessageIndexingStarted.h"
+#include "MessageActivateAll.h"
+#include "MessageActivateFullTextSearch.h"
+#include "MessageActivateTokens.h"
 
-#include "component/controller/Controller.h"
-#include "component/view/ErrorView.h"
+#include "Controller.h"
+#include "ErrorView.h"
 
 class StorageAccess;
 

src/lib/component/controller/GraphController.cpp

@@ -1,26 +1,26 @@
-#include "component/controller/GraphController.h"
+#include "GraphController.h"
 
 #include <set>
 
-#include "utility/logging/logging.h"
-#include "utility/messaging/type/MessageActivateNodes.h"
-#include "utility/messaging/type/MessageStatus.h"
-#include "utility/tracing.h"
-#include "utility/utility.h"
-#include "utility/utilityString.h"
+#include "logging.h"
+#include "MessageActivateNodes.h"
+#include "MessageStatus.h"
+#include "tracing.h"
+#include "utility.h"
+#include "utilityString.h"
 
 #include "Application.h"
-#include "component/controller/helper/BucketLayouter.h"
-#include "component/controller/helper/ListLayouter.h"
-#include "component/controller/helper/TrailLayouter.h"
-#include "component/view/GraphView.h"
-#include "component/view/GraphViewStyle.h"
-#include "data/access/StorageAccess.h"
-#include "data/graph/token_component/TokenComponentAccess.h"
-#include "data/graph/token_component/TokenComponentFilePath.h"
-#include "data/graph/Graph.h"
-#include "data/parser/AccessKind.h"
-#include "settings/ApplicationSettings.h"
+#include "BucketLayouter.h"
+#include "ListLayouter.h"
+#include "TrailLayouter.h"
+#include "GraphView.h"
+#include "GraphViewStyle.h"
+#include "StorageAccess.h"
+#include "TokenComponentAccess.h"
+#include "TokenComponentFilePath.h"
+#include "Graph.h"
+#include "AccessKind.h"
+#include "ApplicationSettings.h"
 
 GraphController::GraphController(StorageAccess* storageAccess)
 	: m_storageAccess(storageAccess)

src/lib/component/controller/GraphController.h

@@ -4,29 +4,29 @@
 #include <list>
 #include <vector>
 
-#include "utility/messaging/MessageListener.h"
-#include "utility/messaging/type/activation/MessageActivateLegend.h"
-#include "utility/messaging/type/error/MessageActivateErrors.h"
-#include "utility/messaging/type/MessageActivateAll.h"
-#include "utility/messaging/type/MessageActivateFullTextSearch.h"
-#include "utility/messaging/type/MessageActivateTokens.h"
-#include "utility/messaging/type/MessageActivateTrail.h"
-#include "utility/messaging/type/MessageActivateTrailEdge.h"
-#include "utility/messaging/type/MessageFlushUpdates.h"
-#include "utility/messaging/type/MessageFocusIn.h"
-#include "utility/messaging/type/MessageFocusOut.h"
-#include "utility/messaging/type/MessageGraphNodeBundleSplit.h"
-#include "utility/messaging/type/MessageGraphNodeExpand.h"
-#include "utility/messaging/type/MessageGraphNodeHide.h"
-#include "utility/messaging/type/MessageGraphNodeMove.h"
-#include "utility/messaging/type/MessageScrollGraph.h"
-#include "utility/messaging/type/MessageShowReference.h"
+#include "MessageListener.h"
+#include "MessageActivateLegend.h"
+#include "MessageActivateErrors.h"
+#include "MessageActivateAll.h"
+#include "MessageActivateFullTextSearch.h"
+#include "MessageActivateTokens.h"
+#include "MessageActivateTrail.h"
+#include "MessageActivateTrailEdge.h"
+#include "MessageFlushUpdates.h"
+#include "MessageFocusIn.h"
+#include "MessageFocusOut.h"
+#include "MessageGraphNodeBundleSplit.h"
+#include "MessageGraphNodeExpand.h"
+#include "MessageGraphNodeHide.h"
+#include "MessageGraphNodeMove.h"
+#include "MessageScrollGraph.h"
+#include "MessageShowReference.h"
 
-#include "component/controller/Controller.h"
-#include "component/controller/helper/DummyEdge.h"
-#include "component/controller/helper/DummyNode.h"
-#include "component/view/GraphView.h"
-#include "data/graph/Node.h"
+#include "Controller.h"
+#include "DummyEdge.h"
+#include "DummyNode.h"
+#include "GraphView.h"
+#include "Node.h"
 
 class Graph;
 class StorageAccess;

src/lib/component/controller/IDECommunicationController.cpp

@@ -1,16 +1,16 @@
 #include "IDECommunicationController.h"
 
-#include "utility/file/FileSystem.h"
-#include "utility/logging/logging.h"
-#include "utility/messaging/type/MessageActivateSourceLocations.h"
-#include "utility/messaging/type/MessageActivateWindow.h"
-#include "utility/messaging/type/MessageProjectNew.h"
-#include "utility/messaging/type/MessageStatus.h"
-#include "utility/messaging/type/MessageActivateFile.h"
-#include "utility/messaging/type/MessagePingReceived.h"
+#include "FileSystem.h"
+#include "logging.h"
+#include "MessageActivateSourceLocations.h"
+#include "MessageActivateWindow.h"
+#include "MessageProjectNew.h"
+#include "MessageStatus.h"
+#include "MessageActivateFile.h"
+#include "MessagePingReceived.h"
 
-#include "data/access/StorageAccess.h"
-#include "data/location/SourceLocationFile.h"
+#include "StorageAccess.h"
+#include "SourceLocationFile.h"
 
 IDECommunicationController::IDECommunicationController(StorageAccess* storageAccess)
 	: m_storageAccess(storageAccess)

src/lib/component/controller/IDECommunicationController.h

@@ -3,14 +3,14 @@
 
 #include <string>
 
-#include "component/controller/Controller.h"
-#include "component/controller/helper/NetworkProtocolHelper.h"
+#include "Controller.h"
+#include "NetworkProtocolHelper.h"
 
-#include "utility/messaging/MessageListener.h"
-#include "utility/messaging/type/MessageWindowFocus.h"
-#include "utility/messaging/type/MessageIDECreateCDB.h"
-#include "utility/messaging/type/MessageMoveIDECursor.h"
-#include "utility/messaging/type/MessagePluginPortChange.h"
+#include "MessageListener.h"
+#include "MessageWindowFocus.h"
+#include "MessageIDECreateCDB.h"
+#include "MessageMoveIDECursor.h"
+#include "MessagePluginPortChange.h"
 
 class StorageAccess;
 

src/lib/component/controller/RefreshController.cpp

@@ -1,6 +1,6 @@
-#include "component/controller/RefreshController.h"
+#include "RefreshController.h"
 
-#include "component/view/RefreshView.h"
+#include "RefreshView.h"
 
 RefreshController::RefreshController()
 {

src/lib/component/controller/RefreshController.h

@@ -1,7 +1,7 @@
 #ifndef REFRESH_CONTROLLER_H
 #define REFRESH_CONTROLLER_H
 
-#include "component/controller/Controller.h"
+#include "Controller.h"
 
 class RefreshView;
 

src/lib/component/controller/ScreenSearchController.cpp

@@ -1,6 +1,6 @@
-#include "component/controller/ScreenSearchController.h"
+#include "ScreenSearchController.h"
 
-#include "component/view/ScreenSearchView.h"
+#include "ScreenSearchView.h"
 
 ScreenSearchController::ScreenSearchController()
 {

src/lib/component/controller/ScreenSearchController.h

@@ -4,9 +4,9 @@
 #include <mutex>
 #include <set>
 
-#include "component/controller/Controller.h"
-#include "component/controller/helper/ScreenSearchInterfaces.h"
-#include "utility/messaging/MessageListener.h"
+#include "Controller.h"
+#include "ScreenSearchInterfaces.h"
+#include "MessageListener.h"
 
 class ScreenSearchController
 	: public Controller

src/lib/component/controller/SearchController.cpp

@@ -1,9 +1,9 @@
-#include "component/controller/SearchController.h"
+#include "SearchController.h"
 
-#include "component/view/SearchView.h"
-#include "data/access/StorageAccess.h"
-#include "utility/logging/logging.h"
-#include "utility/tracing.h"
+#include "SearchView.h"
+#include "StorageAccess.h"
+#include "logging.h"
+#include "tracing.h"
 
 SearchController::SearchController(StorageAccess* storageAccess)
 	: m_storageAccess(storageAccess)

src/lib/component/controller/SearchController.h

@@ -1,15 +1,15 @@
 #ifndef SEARCH_CONTROLLER_H
 #define SEARCH_CONTROLLER_H
 
-#include "component/controller/Controller.h"
-#include "utility/messaging/MessageListener.h"
-#include "utility/messaging/type/activation/MessageActivateLegend.h"
-#include "utility/messaging/type/error/MessageActivateErrors.h"
-#include "utility/messaging/type/MessageActivateAll.h"
-#include "utility/messaging/type/MessageActivateFullTextSearch.h"
-#include "utility/messaging/type/MessageActivateTokens.h"
-#include "utility/messaging/type/MessageFind.h"
-#include "utility/messaging/type/MessageSearchAutocomplete.h"
+#include "Controller.h"
+#include "MessageListener.h"
+#include "MessageActivateLegend.h"
+#include "MessageActivateErrors.h"
+#include "MessageActivateAll.h"
+#include "MessageActivateFullTextSearch.h"
+#include "MessageActivateTokens.h"
+#include "MessageFind.h"
+#include "MessageSearchAutocomplete.h"
 
 class StorageAccess;
 class SearchView;

src/lib/component/controller/StatusBarController.cpp

@@ -1,8 +1,8 @@
-#include "component/controller/StatusBarController.h"
+#include "StatusBarController.h"
 
-#include "component/view/StatusBarView.h"
-#include "data/access/StorageAccess.h"
-#include "utility/logging/logging.h"
+#include "StatusBarView.h"
+#include "StorageAccess.h"
+#include "logging.h"
 
 StatusBarController::StatusBarController(StorageAccess* storageAccess)
 	: m_storageAccess(storageAccess)

src/lib/component/controller/StatusBarController.h

@@ -3,17 +3,17 @@
 
 #include <string>
 
-#include "component/controller/Controller.h"
+#include "Controller.h"
 
-#include "utility/messaging/MessageListener.h"
-#include "utility/messaging/type/error/MessageErrorCountClear.h"
-#include "utility/messaging/type/error/MessageErrorCountUpdate.h"
-#include "utility/messaging/type/indexing/MessageIndexingFinished.h"
-#include "utility/messaging/type/indexing/MessageIndexingStarted.h"
-#include "utility/messaging/type/indexing/MessageIndexingStatus.h"
-#include "utility/messaging/type/MessagePingReceived.h"
-#include "utility/messaging/type/MessageRefresh.h"
-#include "utility/messaging/type/MessageStatus.h"
+#include "MessageListener.h"
+#include "MessageErrorCountClear.h"
+#include "MessageErrorCountUpdate.h"
+#include "MessageIndexingFinished.h"
+#include "MessageIndexingStarted.h"
+#include "MessageIndexingStatus.h"
+#include "MessagePingReceived.h"
+#include "MessageRefresh.h"
+#include "MessageStatus.h"
 
 class StatusBarView;
 class StorageAccess;

src/lib/component/controller/StatusController.cpp

@@ -1,8 +1,8 @@
-#include "component/controller/StatusController.h"
+#include "StatusController.h"
 
-#include "settings/ApplicationSettings.h"
-#include "component/view/StatusView.h"
-#include "utility/utility.h"
+#include "ApplicationSettings.h"
+#include "StatusView.h"
+#include "utility.h"
 
 StatusController::StatusController()
 {

src/lib/component/controller/StatusController.h

@@ -1,14 +1,14 @@
 #ifndef STATUS_CONTROLLER_H
 #define STATUS_CONTROLLER_H
 
-#include "component/controller/Controller.h"
+#include "Controller.h"
 
-#include "utility/messaging/MessageListener.h"
-#include "utility/messaging/type/MessageClearStatusView.h"
-#include "utility/messaging/type/MessageShowStatus.h"
-#include "utility/messaging/type/MessageStatus.h"
-#include "utility/messaging/type/MessageStatusFilterChanged.h"
-#include "utility/Status.h"
+#include "MessageListener.h"
+#include "MessageClearStatusView.h"
+#include "MessageShowStatus.h"
+#include "MessageStatus.h"
+#include "MessageStatusFilterChanged.h"
+#include "Status.h"
 
 class StatusView;
 class StorageAccess;

src/lib/component/controller/TooltipController.cpp

@@ -1,13 +1,13 @@
 #include "TooltipController.h"
 
-#include "component/view/CodeView.h"
-#include "component/view/GraphView.h"
-#include "component/view/TooltipView.h"
-#include "data/access/StorageAccess.h"
+#include "CodeView.h"
+#include "GraphView.h"
+#include "TooltipView.h"
+#include "StorageAccess.h"
 
-#include "utility/messaging/type/MessageActivateSourceLocations.h"
-#include "utility/scheduling/TaskDecoratorDelay.h"
-#include "utility/scheduling/TaskLambda.h"
+#include "MessageActivateSourceLocations.h"
+#include "TaskDecoratorDelay.h"
+#include "TaskLambda.h"
 
 Id TooltipController::TooltipRequest::s_requestId = 1;
 

src/lib/component/controller/TooltipController.h

@@ -1,18 +1,18 @@
 #ifndef TOOLTIP_CONTROLLER_H
 #define TOOLTIP_CONTROLLER_H
 
-#include "component/controller/Controller.h"
-#include "utility/messaging/MessageListener.h"
-#include "utility/messaging/type/MessageActivateTokens.h"
-#include "utility/messaging/type/MessageActivateLocalSymbols.h"
-#include "utility/messaging/type/MessageFocusIn.h"
-#include "utility/messaging/type/MessageFocusOut.h"
-#include "utility/messaging/type/MessageGraphNodeExpand.h"
-#include "utility/messaging/type/MessageScrollCode.h"
-#include "utility/messaging/type/MessageScrollGraph.h"
-#include "utility/messaging/type/MessageTooltipHide.h"
-#include "utility/messaging/type/MessageTooltipShow.h"
-#include "utility/messaging/type/MessageWindowFocus.h"
+#include "Controller.h"
+#include "MessageListener.h"
+#include "MessageActivateTokens.h"
+#include "MessageActivateLocalSymbols.h"
+#include "MessageFocusIn.h"
+#include "MessageFocusOut.h"
+#include "MessageGraphNodeExpand.h"
+#include "MessageScrollCode.h"
+#include "MessageScrollGraph.h"
+#include "MessageTooltipHide.h"
+#include "MessageTooltipShow.h"
+#include "MessageWindowFocus.h"
 
 class StorageAccess;
 class TooltipView;

src/lib/component/controller/UndoRedoController.cpp

@@ -1,13 +1,13 @@
-#include "component/controller/UndoRedoController.h"
+#include "UndoRedoController.h"
 
-#include "utility/messaging/type/MessageFlushUpdates.h"
-#include "utility/messaging/type/MessageSearch.h"
-#include "utility/utility.h"
+#include "MessageFlushUpdates.h"
+#include "MessageSearch.h"
+#include "utility.h"
 
 #include "Application.h"
-#include "component/view/UndoRedoView.h"
-#include "data/access/StorageAccess.h"
-#include "project/Project.h"
+#include "UndoRedoView.h"
+#include "StorageAccess.h"
+#include "Project.h"
 
 UndoRedoController::UndoRedoController(StorageAccess* storageAccess)
 	: m_storageAccess(storageAccess)

src/lib/component/controller/UndoRedoController.h

@@ -3,35 +3,35 @@
 
 #include <list>
 
-#include "utility/messaging/MessageBase.h"
-#include "utility/messaging/MessageListener.h"
-#include "utility/messaging/type/activation/MessageActivateLegend.h"
-#include "utility/messaging/type/code/MessageCodeShowDefinition.h"
-#include "utility/messaging/type/error/MessageActivateErrors.h"
-#include "utility/messaging/type/error/MessageShowError.h"
-#include "utility/messaging/type/history/MessageHistoryRedo.h"
-#include "utility/messaging/type/history/MessageHistoryToPosition.h"
-#include "utility/messaging/type/history/MessageHistoryUndo.h"
-#include "utility/messaging/type/indexing/MessageIndexingFinished.h"
-#include "utility/messaging/type/MessageActivateAll.h"
-#include "utility/messaging/type/MessageActivateFullTextSearch.h"
-#include "utility/messaging/type/MessageActivateLocalSymbols.h"
-#include "utility/messaging/type/MessageActivateTokens.h"
-#include "utility/messaging/type/MessageActivateTrail.h"
-#include "utility/messaging/type/MessageActivateTrailEdge.h"
-#include "utility/messaging/type/MessageChangeFileView.h"
-#include "utility/messaging/type/MessageDeactivateEdge.h"
-#include "utility/messaging/type/MessageGraphNodeBundleSplit.h"
-#include "utility/messaging/type/MessageGraphNodeExpand.h"
-#include "utility/messaging/type/MessageGraphNodeHide.h"
-#include "utility/messaging/type/MessageGraphNodeMove.h"
-#include "utility/messaging/type/MessageRefresh.h"
-#include "utility/messaging/type/MessageScrollCode.h"
-#include "utility/messaging/type/MessageScrollGraph.h"
-#include "utility/messaging/type/MessageShowReference.h"
-#include "utility/messaging/type/MessageShowScope.h"
+#include "MessageBase.h"
+#include "MessageListener.h"
+#include "MessageActivateLegend.h"
+#include "MessageCodeShowDefinition.h"
+#include "MessageActivateErrors.h"
+#include "MessageShowError.h"
+#include "MessageHistoryRedo.h"
+#include "MessageHistoryToPosition.h"
+#include "MessageHistoryUndo.h"
+#include "MessageIndexingFinished.h"
+#include "MessageActivateAll.h"
+#include "MessageActivateFullTextSearch.h"
+#include "MessageActivateLocalSymbols.h"
+#include "MessageActivateTokens.h"
+#include "MessageActivateTrail.h"
+#include "MessageActivateTrailEdge.h"
+#include "MessageChangeFileView.h"
+#include "MessageDeactivateEdge.h"
+#include "MessageGraphNodeBundleSplit.h"
+#include "MessageGraphNodeExpand.h"
+#include "MessageGraphNodeHide.h"
+#include "MessageGraphNodeMove.h"
+#include "MessageRefresh.h"
+#include "MessageScrollCode.h"
+#include "MessageScrollGraph.h"
+#include "MessageShowReference.h"
+#include "MessageShowScope.h"
 
-#include "component/controller/Controller.h"
+#include "Controller.h"
 
 class StorageAccess;
 class UndoRedoView;

src/lib/component/controller/helper/BucketLayouter.cpp

@@ -1,7 +1,7 @@
-#include "component/controller/helper/BucketLayouter.h"
+#include "BucketLayouter.h"
 
-#include "component/controller/helper/DummyEdge.h"
-#include "component/view/GraphViewStyle.h"
+#include "DummyEdge.h"
+#include "GraphViewStyle.h"
 
 Bucket::Bucket()
 	: i(0)

src/lib/component/controller/helper/BucketLayouter.h

@@ -3,10 +3,10 @@
 
 #include <map>
 
-#include "utility/math/Vector2.h"
-#include "utility/types.h"
+#include "Vector2.h"
+#include "types.h"
 
-#include "component/controller/helper/DummyNode.h"
+#include "DummyNode.h"
 
 struct DummyEdge;
 

src/lib/component/controller/helper/ControllerProxy.h

@@ -3,9 +3,9 @@
 
 #include <functional>
 
-#include "utility/scheduling/TaskLambda.h"
+#include "TaskLambda.h"
 
-#include "component/view/View.h"
+#include "View.h"
 
 template <typename ControllerType>
 class ControllerProxy

src/lib/component/controller/helper/DummyEdge.h

@@ -1,11 +1,11 @@
 #ifndef DUMMY_EDGE_H
 #define DUMMY_EDGE_H
 
-#include "utility/types.h"
-#include "utility/math/Vector4.h"
+#include "types.h"
+#include "Vector4.h"
 
-#include "data/graph/Edge.h"
-#include "data/graph/token_component/TokenComponentAggregation.h"
+#include "Edge.h"
+#include "TokenComponentAggregation.h"
 
 class Edge;
 

src/lib/component/controller/helper/DummyNode.h

@@ -1,16 +1,16 @@
 #ifndef DUMMY_NODE_H
 #define DUMMY_NODE_H
 
-#include "utility/math/Vector2.h"
-#include "utility/math/Vector4.h"
-#include "utility/types.h"
-#include "utility/utility.h"
-#include "utility/utilityString.h"
+#include "Vector2.h"
+#include "Vector4.h"
+#include "types.h"
+#include "utility.h"
+#include "utilityString.h"
 
-#include "data/graph/Node.h"
-#include "data/GroupType.h"
-#include "data/name/NameHierarchy.h"
-#include "data/parser/AccessKind.h"
+#include "Node.h"
+#include "GroupType.h"
+#include "NameHierarchy.h"
+#include "AccessKind.h"
 
 // temporary data structure for (visual) graph creation process
 struct DummyNode

src/lib/component/controller/helper/ListLayouter.cpp

@@ -1,9 +1,9 @@
-#include "component/controller/helper/ListLayouter.h"
+#include "ListLayouter.h"
 
 #include <algorithm>
 
-#include "component/controller/helper/DummyNode.h"
-#include "component/view/GraphViewStyle.h"
+#include "DummyNode.h"
+#include "GraphViewStyle.h"
 
 void ListLayouter::layoutRow(std::vector<std::shared_ptr<DummyNode>>* nodes, int gap)
 {

src/lib/component/controller/helper/ListLayouter.h

@@ -4,8 +4,8 @@
 #include <memory>
 #include <vector>
 
-#include "utility/math/Vector2.h"
-#include "utility/math/Vector4.h"
+#include "Vector2.h"
+#include "Vector4.h"
 
 struct DummyNode;
 

src/lib/component/controller/helper/NetworkProtocolHelper.cpp

@@ -5,8 +5,8 @@
 
 #include <boost/algorithm/string.hpp>
 
-#include "utility/logging/logging.h"
-#include "utility/utilityString.h"
+#include "logging.h"
+#include "utilityString.h"
 
 std::wstring NetworkProtocolHelper::s_divider = L">>";
 std::wstring NetworkProtocolHelper::s_setActiveTokenPrefix = L"setActiveToken";

src/lib/component/controller/helper/NetworkProtocolHelper.h

@@ -4,7 +4,7 @@
 #include <string>
 #include <vector>
 
-#include "utility/file/FilePath.h"
+#include "FilePath.h"
 
 class NetworkProtocolHelper
 {

src/lib/component/controller/helper/SnippetMerger.cpp

@@ -1,7 +1,7 @@
-#include "component/controller/helper/SnippetMerger.h"
+#include "SnippetMerger.h"
 
 #include <algorithm>
-#include "settings/ApplicationSettings.h"
+#include "ApplicationSettings.h"
 
 SnippetMerger::SnippetMerger(int startRow, int endRow)
 	: m_start(startRow)

src/lib/component/controller/helper/TrailLayouter.cpp

@@ -1,4 +1,4 @@
-#include "component/controller/helper/TrailLayouter.h"
+#include "TrailLayouter.h"
 
 #include <iostream>
 

src/lib/component/controller/helper/TrailLayouter.h

@@ -5,8 +5,8 @@
 #include <set>
 #include <vector>
 
-#include "component/controller/helper/DummyEdge.h"
-#include "component/controller/helper/DummyNode.h"
+#include "DummyEdge.h"
+#include "DummyNode.h"
 
 // based on Sugiyama dependency graph layouting
 

src/lib/component/view/BookmarkView.cpp

@@ -1,6 +1,6 @@
-#include "component/view/BookmarkView.h"
+#include "BookmarkView.h"
 
-#include "component/controller/BookmarkController.h"
+#include "BookmarkController.h"
 
 BookmarkView::BookmarkView(ViewLayout* viewLayout)
 	: View(viewLayout)

src/lib/component/view/BookmarkView.h

@@ -1,8 +1,8 @@
 #ifndef BOOKMARK_VIEW_H
 #define BOOKMARK_VIEW_H
 
-#include "component/view/View.h"
-#include "data/bookmark/Bookmark.h"
+#include "View.h"
+#include "Bookmark.h"
 
 class BookmarkController;
 

src/lib/component/view/CodeView.cpp

@@ -1,6 +1,6 @@
-#include "component/view/CodeView.h"
+#include "CodeView.h"
 
-#include "component/controller/CodeController.h"
+#include "CodeController.h"
 
 const char* CodeView::VIEW_NAME = "Code";
 

src/lib/component/view/CodeView.h

@@ -3,11 +3,11 @@
 
 #include <memory>
 
-#include "data/ErrorInfo.h"
+#include "ErrorInfo.h"
 
-#include "component/controller/helper/ScreenSearchInterfaces.h"
-#include "component/view/helper/CodeSnippetParams.h"
-#include "component/view/View.h"
+#include "ScreenSearchInterfaces.h"
+#include "CodeSnippetParams.h"
+#include "View.h"
 
 class CodeController;
 class FilePath;

src/lib/component/view/CompositeView.cpp

@@ -1,4 +1,4 @@
-#include "component/view/CompositeView.h"
+#include "CompositeView.h"
 
 #include <algorithm>
 

src/lib/component/view/CompositeView.h

@@ -3,8 +3,8 @@
 
 #include <vector>
 
-#include "component/view/View.h"
-#include "component/view/ViewLayout.h"
+#include "View.h"
+#include "ViewLayout.h"
 
 class CompositeView
 	: public View

src/lib/component/view/DialogView.cpp

@@ -1,4 +1,4 @@
-#include "component/view/DialogView.h"
+#include "DialogView.h"
 
 DialogView::DialogView(UseCase useCase, StorageAccess* storageAccess)
 	: m_useCase(useCase)

src/lib/component/view/DialogView.h

@@ -5,8 +5,8 @@
 #include <string>
 #include <vector>
 
-#include "data/ErrorCountInfo.h"
-#include "project/RefreshInfo.h"
+#include "ErrorCountInfo.h"
+#include "RefreshInfo.h"
 
 class Project;
 class StorageAccess;

src/lib/component/view/ErrorView.cpp

@@ -1,4 +1,4 @@
-#include "component/view/ErrorView.h"
+#include "ErrorView.h"
 
 ErrorView::ErrorView(ViewLayout* viewLayout)
 	: View(viewLayout)

src/lib/component/view/ErrorView.h

@@ -3,10 +3,10 @@
 
 #include <vector>
 
-#include "component/view/View.h"
-#include "data/ErrorCountInfo.h"
-#include "data/ErrorFilter.h"
-#include "data/ErrorInfo.h"
+#include "View.h"
+#include "ErrorCountInfo.h"
+#include "ErrorFilter.h"
+#include "ErrorInfo.h"
 
 class ErrorView
 	: public View

src/lib/component/view/GraphView.cpp

@@ -1,4 +1,4 @@
-#include "component/view/GraphView.h"
+#include "GraphView.h"
 
 const char* GraphView::VIEW_NAME = "Graph";
 

src/lib/component/view/GraphView.h

@@ -3,12 +3,12 @@
 
 #include <vector>
 
-#include "utility/math/Vector2.h"
-#include "utility/types.h"
+#include "Vector2.h"
+#include "types.h"
 
-#include "component/controller/helper/ScreenSearchInterfaces.h"
-#include "component/view/View.h"
-#include "data/GroupType.h"
+#include "ScreenSearchInterfaces.h"
+#include "View.h"
+#include "GroupType.h"
 
 struct DummyEdge;
 struct DummyNode;

src/lib/component/view/GraphViewStyle.cpp

@@ -1,11 +1,11 @@
-#include "component/view/GraphViewStyle.h"
+#include "GraphViewStyle.h"
 
-#include "component/view/GraphViewStyleImpl.h"
-#include "settings/ApplicationSettings.h"
-#include "settings/ColorScheme.h"
-#include "utility/logging/logging.h"
-#include "utility/ResourcePaths.h"
-#include "utility/utilityString.h"
+#include "GraphViewStyleImpl.h"
+#include "ApplicationSettings.h"
+#include "ColorScheme.h"
+#include "logging.h"
+#include "ResourcePaths.h"
+#include "utilityString.h"
 
 int GraphViewStyle::s_gridCellSize = 5;
 int GraphViewStyle::s_gridCellPadding = 10;

src/lib/component/view/GraphViewStyle.h

@@ -4,11 +4,11 @@
 #include <map>
 #include <memory>
 
-#include "utility/math/Vector2.h"
+#include "Vector2.h"
 
-#include "data/graph/Node.h"
-#include "data/GroupType.h"
-#include "data/parser/AccessKind.h"
+#include "Node.h"
+#include "GroupType.h"
+#include "AccessKind.h"
 
 class GraphViewStyleImpl;
 

src/lib/component/view/GraphViewStyleImpl.h

@@ -1,7 +1,7 @@
 #ifndef GRAPH_VIEW_STYLE_IMPL_H
 #define GRAPH_VIEW_STYLE_IMPL_H
 
-#include "data/graph/Node.h"
+#include "Node.h"
 
 class GraphViewStyleImpl
 {

src/lib/component/view/MainView.cpp

@@ -1,4 +1,4 @@
-#include "component/view/MainView.h"
+#include "MainView.h"
 
 MainView::MainView()
 {

src/lib/component/view/MainView.h

@@ -5,7 +5,7 @@
 #include <string>
 #include <vector>
 
-#include "component/view/ViewLayout.h"
+#include "ViewLayout.h"
 
 struct SearchMatch;
 class Bookmark;

src/lib/component/view/RefreshView.cpp

@@ -1,6 +1,6 @@
-#include "component/view/RefreshView.h"
+#include "RefreshView.h"
 
-#include "component/controller/RefreshController.h"
+#include "RefreshController.h"
 
 RefreshView::RefreshView(ViewLayout* viewLayout)
 	: View(viewLayout)

src/lib/component/view/RefreshView.h

@@ -1,7 +1,7 @@
 #ifndef REFRESH_VIEW_H
 #define REFRESH_VIEW_H
 
-#include "component/view/View.h"
+#include "View.h"
 
 class RefreshController;
 

src/lib/component/view/ScreenSearchView.cpp

@@ -1,4 +1,4 @@
-#include "component/view/ScreenSearchView.h"
+#include "ScreenSearchView.h"
 
 ScreenSearchView::ScreenSearchView(ViewLayout* viewLayout)
 	: View(viewLayout)

src/lib/component/view/ScreenSearchView.h

@@ -1,7 +1,7 @@
 #ifndef SCREEN_SEARCH_VIEW_H
 #define SCREEN_SEARCH_VIEW_H
 
-#include "component/view/View.h"
+#include "View.h"
 
 class ScreenSearchView
 	: public View

src/lib/component/view/SearchView.cpp

@@ -1,6 +1,6 @@
-#include "component/view/SearchView.h"
+#include "SearchView.h"
 
-#include "component/controller/SearchController.h"
+#include "SearchController.h"
 
 SearchView::SearchView(ViewLayout* viewLayout)
 	: View(viewLayout)

src/lib/component/view/SearchView.h

@@ -1,8 +1,8 @@
 #ifndef SEARCH_VIEW_H
 #define SEARCH_VIEW_H
 
-#include "component/view/View.h"
-#include "data/search/SearchMatch.h"
+#include "View.h"
+#include "SearchMatch.h"
 
 class SearchController;
 

src/lib/component/view/StatusBarView.cpp

@@ -1,6 +1,6 @@
-#include "component/view/StatusBarView.h"
+#include "StatusBarView.h"
 
-#include "component/controller/StatusBarController.h"
+#include "StatusBarController.h"
 
 StatusBarView::StatusBarView(ViewLayout* viewLayout)
 	: View(viewLayout)

src/lib/component/view/StatusBarView.h

@@ -1,8 +1,8 @@
 #ifndef STATUS_BAR_VIEW_H
 #define STATUS_BAR_VIEW_H
 
-#include "component/view/View.h"
-#include "data/ErrorCountInfo.h"
+#include "View.h"
+#include "ErrorCountInfo.h"
 
 class StatusBarController;
 

src/lib/component/view/StatusView.cpp

@@ -1,4 +1,4 @@
-#include "component/view/StatusView.h"
+#include "StatusView.h"
 
 StatusView::StatusView(ViewLayout* viewLayout)
 	: View(viewLayout)

src/lib/component/view/StatusView.h

@@ -3,8 +3,8 @@
 
 #include <vector>
 
-#include "component/view/View.h"
-#include "utility/Status.h"
+#include "View.h"
+#include "Status.h"
 
 class StatusView
 	: public View

src/lib/component/view/TabbedView.cpp

@@ -1,4 +1,4 @@
-#include "component/view/TabbedView.h"
+#include "TabbedView.h"
 
 #include <algorithm>
 

src/lib/component/view/TabbedView.h

@@ -3,8 +3,8 @@
 
 #include <vector>
 
-#include "component/view/View.h"
-#include "component/view/ViewLayout.h"
+#include "View.h"
+#include "ViewLayout.h"
 
 class TabbedView
 	: public View

src/lib/component/view/TooltipView.cpp

@@ -1,4 +1,4 @@
-#include "component/view/TooltipView.h"
+#include "TooltipView.h"
 
 TooltipView::TooltipView(ViewLayout* viewLayout)
 	: View(viewLayout)
@@ -13,4 +13,3 @@ std::string TooltipView::getName() const
 {
 	return "TooltipView";
 }
-

src/lib/component/view/TooltipView.h

@@ -3,10 +3,10 @@
 
 #include <vector>
 
-#include "component/view/View.h"
-#include "data/name/NameHierarchy.h"
-#include "data/tooltip/TooltipInfo.h"
-#include "utility/types.h"
+#include "View.h"
+#include "NameHierarchy.h"
+#include "TooltipInfo.h"
+#include "types.h"
 
 class TooltipView
 	: public View

src/lib/component/view/UndoRedoView.cpp

@@ -1,6 +1,6 @@
-#include "component/view/UndoRedoView.h"
+#include "UndoRedoView.h"
 
-#include "component/controller/UndoRedoController.h"
+#include "UndoRedoController.h"
 
 UndoRedoView::UndoRedoView(ViewLayout* viewLayout)
 	: View(viewLayout)

src/lib/component/view/UndoRedoView.h

@@ -3,7 +3,7 @@
 
 #include <vector>
 
-#include "component/view/View.h"
+#include "View.h"
 #include <vector>
 
 class UndoRedoController;

src/lib/component/view/View.cpp

@@ -1,6 +1,6 @@
-#include "component/view/View.h"
+#include "View.h"
 
-#include "component/view/ViewWidgetWrapper.h"
+#include "ViewWidgetWrapper.h"
 
 View::View(ViewLayout* viewLayout)
 	: m_viewLayout(viewLayout)

src/lib/component/view/View.h

@@ -4,8 +4,8 @@
 #include <memory>
 #include <string>
 
-#include "component/Component.h"
-#include "component/view/ViewLayout.h"
+#include "Component.h"
+#include "ViewLayout.h"
 
 class ViewWidgetWrapper;
 

src/lib/component/view/ViewFactory.cpp

@@ -1,4 +1,4 @@
-#include "component/view/ViewFactory.h"
+#include "ViewFactory.h"
 
 ViewFactory::ViewFactory()
 {

src/lib/component/view/ViewFactory.h

@@ -3,8 +3,8 @@
 
 #include <memory>
 
-#include "component/view/CompositeView.h"
-#include "component/view/DialogView.h"
+#include "CompositeView.h"
+#include "DialogView.h"
 
 class BookmarkView;
 class CodeView;

src/lib/component/view/ViewLayout.cpp

@@ -1,4 +1,4 @@
-#include "component/view/ViewLayout.h"
+#include "ViewLayout.h"
 
 ViewLayout::ViewLayout()
 {

src/lib/component/view/ViewWidgetWrapper.cpp

@@ -1,4 +1,4 @@
-#include "component/view/ViewWidgetWrapper.h"
+#include "ViewWidgetWrapper.h"
 
 ViewWidgetWrapper::ViewWidgetWrapper()
 {

src/lib/component/view/helper/CodeSnippetParams.cpp

@@ -1,6 +1,6 @@
-#include "component/view/helper/CodeSnippetParams.h"
+#include "CodeSnippetParams.h"
 
-#include "data/location/SourceLocationFile.h"
+#include "SourceLocationFile.h"
 
 CodeSnippetParams::CodeSnippetParams()
 	: startLineNumber(0)

src/lib/component/view/helper/CodeSnippetParams.h

@@ -3,8 +3,8 @@
 
 #include <memory>
 
-#include "utility/TimeStamp.h"
-#include "utility/types.h"
+#include "TimeStamp.h"
+#include "types.h"
 
 class SourceLocationFile;
 

src/lib/data/DefinitionKind.cpp

@@ -1,4 +1,4 @@
-#include "data/DefinitionKind.h"
+#include "DefinitionKind.h"
 
 int definitionKindToInt(DefinitionKind definitionKind)
 {

src/lib/data/ErrorCountInfo.h

@@ -1,7 +1,7 @@
 #ifndef ERROR_COUNT_INFO_H
 #define ERROR_COUNT_INFO_H
 
-#include "data/ErrorInfo.h"
+#include "ErrorInfo.h"
 
 struct ErrorCountInfo
 {

src/lib/data/ErrorFilter.h

@@ -1,7 +1,7 @@
 #ifndef ERROR_FILTER_H
 #define ERROR_FILTER_H
 
-#include "data/ErrorInfo.h"
+#include "ErrorInfo.h"
 
 struct ErrorFilter
 {