Update: Change src dir

pwnsky · Sep 29, 2024 · 78b8568 · 78b8568
1 parent 2a30f76
commit 78b8568
Show file tree

Hide file tree

Showing 355 changed files with 433 additions and 416 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -124,9 +124,8 @@ add_definitions(-D_X64 -D_CONSOLE -DSQUICK_DYNAMIC_PLUGIN -DSQUICK_ENABLE_SSL)
 add_definitions(-DSQUICK_LOG_OPEN_STDOUT) # Log stdout print
 
 add_subdirectory(src/struct)
-add_subdirectory(src/squick)
-add_subdirectory(src/node)
-add_subdirectory(src/tutorial)
+add_subdirectory(src/core)
+add_subdirectory(src/plugin)
 
 
 if( EXTRA STREQUAL "EXTRA" )

diff --git a/res b/res
diff --git a/src/squick/core/CMakeLists.txt → src/core/CMakeLists.txt b/src/squick/core/CMakeLists.txt → src/core/CMakeLists.txt
diff --git a/src/squick/core/base.cc → src/core/base.cc b/src/squick/core/base.cc → src/core/base.cc
diff --git a/src/squick/core/base.h → src/core/base.h b/src/squick/core/base.h → src/core/base.h
diff --git a/src/squick/core/consistent_hash.h → src/core/consistent_hash.h b/src/squick/core/consistent_hash.h → src/core/consistent_hash.h
diff --git a/src/squick/core/data_list.h → src/core/data_list.h b/src/squick/core/data_list.h → src/core/data_list.h
diff --git a/src/squick/core/date_time.h → src/core/date_time.h b/src/squick/core/date_time.h → src/core/date_time.h
diff --git a/src/squick/core/dyn_lib.cc → src/core/dyn_lib.cc b/src/squick/core/dyn_lib.cc → src/core/dyn_lib.cc
diff --git a/src/squick/core/dyn_lib.h → src/core/dyn_lib.h b/src/squick/core/dyn_lib.h → src/core/dyn_lib.h
diff --git a/src/squick/core/exception.cc → src/core/exception.cc b/src/squick/core/exception.cc → src/core/exception.cc
diff --git a/src/squick/core/exception.h → src/core/exception.h b/src/squick/core/exception.h → src/core/exception.h
diff --git a/src/squick/core/guid.h → src/core/guid.h b/src/squick/core/guid.h → src/core/guid.h
diff --git a/src/squick/core/i_module.h → src/core/i_module.h b/src/squick/core/i_module.h → src/core/i_module.h
diff --git a/src/squick/core/i_object.h → src/core/i_object.h b/src/squick/core/i_object.h → src/core/i_object.h
diff --git a/src/squick/core/i_plugin.h → src/core/i_plugin.h b/src/squick/core/i_plugin.h → src/core/i_plugin.h
diff --git a/src/squick/core/i_plugin_manager.h → src/core/i_plugin_manager.h b/src/squick/core/i_plugin_manager.h → src/core/i_plugin_manager.h
@@ -3,7 +3,7 @@
 #include "platform.h"
 #include <functional>
 #include <list>
-#include <squick/core/guid.h>
+#include <core/guid.h>
 #include <vector>
 
 class IPlugin;

diff --git a/src/squick/core/i_property.h → src/core/i_property.h b/src/squick/core/i_property.h → src/core/i_property.h
diff --git a/src/squick/core/i_property_manager.h → src/core/i_property_manager.h b/src/squick/core/i_property_manager.h → src/core/i_property_manager.h
diff --git a/src/squick/core/i_record.h → src/core/i_record.h b/src/squick/core/i_record.h → src/core/i_record.h
diff --git a/src/squick/core/i_record_manager.h → src/core/i_record_manager.h b/src/squick/core/i_record_manager.h → src/core/i_record_manager.h
diff --git a/src/squick/core/i_tag_module.h → src/core/i_tag_module.h b/src/squick/core/i_tag_module.h → src/core/i_tag_module.h
diff --git a/src/squick/core/list.h → src/core/list.h b/src/squick/core/list.h → src/core/list.h
diff --git a/src/squick/core/map.h → src/core/map.h b/src/squick/core/map.h → src/core/map.h
diff --git a/src/squick/core/map_ex.h → src/core/map_ex.h b/src/squick/core/map_ex.h → src/core/map_ex.h
diff --git a/src/squick/core/math.h → src/core/math.h b/src/squick/core/math.h → src/core/math.h
diff --git a/src/squick/core/mem_manager.h → src/core/mem_manager.h b/src/squick/core/mem_manager.h → src/core/mem_manager.h
diff --git a/src/squick/core/memory_counter.cc → src/core/memory_counter.cc b/src/squick/core/memory_counter.cc → src/core/memory_counter.cc
diff --git a/src/squick/core/memory_counter.h → src/core/memory_counter.h b/src/squick/core/memory_counter.h → src/core/memory_counter.h
diff --git a/src/squick/core/object.cc → src/core/object.cc b/src/squick/core/object.cc → src/core/object.cc
diff --git a/src/squick/core/object.h → src/core/object.h b/src/squick/core/object.h → src/core/object.h
diff --git a/src/squick/core/performance.h → src/core/performance.h b/src/squick/core/performance.h → src/core/performance.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <iostream>
-#include <squick/core/base.h>
+#include <core/base.h>
 #include <time.h>
 class Performance {
   private:

diff --git a/src/squick/core/platform.h → src/core/platform.h b/src/squick/core/platform.h → src/core/platform.h
diff --git a/src/squick/core/plugin_manager.cc → src/core/plugin_manager.cc b/src/squick/core/plugin_manager.cc → src/core/plugin_manager.cc
@@ -5,7 +5,7 @@
 #include "third_party/rapidxml/rapidxml_iterators.hpp"
 #include "third_party/rapidxml/rapidxml_print.hpp"
 #include "third_party/rapidxml/rapidxml_utils.hpp"
-#include <squick/core/base.h>
+#include <core/base.h>
 
 PluginManager::PluginManager() : IPluginManager() {
     appID = 0;
@@ -20,7 +20,7 @@ PluginManager::PluginManager() : IPluginManager() {
     mGetFileContentFunctor = nullptr;
 
     configPath = "..";                       // 主要服务路径
-    configName = "config/plugin/plugin.xml"; // 默认插件加载路径
+    configName = "config/plugin.xml"; // 默认插件加载路径
 }
 
 PluginManager::~PluginManager() {}
@@ -64,7 +64,7 @@ bool PluginManager::LoadPluginConfig() {
     rapidxml::xml_node<> *pRoot = xDoc.first_node();
     if (pRoot == nullptr) {
         SQUICK_PRINT("Cannot load plugin config from :" + strFilePath);
-        SQUICK_PRINT("Please check your working directory, make sure config file in the [../config/plugin/] directory.");
+        SQUICK_PRINT("Please check your working directory, make sure config file in the [../config/] directory.");
         return false;
     }
     rapidxml::xml_node<> *pAppNameNode = pRoot->first_node(appName.c_str());

diff --git a/src/squick/core/plugin_manager.h → src/core/plugin_manager.h b/src/squick/core/plugin_manager.h → src/core/plugin_manager.h
diff --git a/src/squick/core/plugin_server.cc → src/core/plugin_server.cc b/src/squick/core/plugin_server.cc → src/core/plugin_server.cc
@@ -1,6 +1,6 @@
 #include "plugin_server.h"
-#include <squick/core/base.h>
-#include <squick/core/exception.h>
+#include <core/base.h>
+#include <core/exception.h>
 #include <algorithm>
 
 PluginServer::PluginServer(const std::string &strArgv) {

diff --git a/src/squick/core/plugin_server.h → src/core/plugin_server.h b/src/squick/core/plugin_server.h → src/core/plugin_server.h
diff --git a/src/squick/core/property.cc → src/core/property.cc b/src/squick/core/property.cc → src/core/property.cc
diff --git a/src/squick/core/property.h → src/core/property.h b/src/squick/core/property.h → src/core/property.h
diff --git a/src/squick/core/property_manager.cc → src/core/property_manager.cc b/src/squick/core/property_manager.cc → src/core/property_manager.cc
diff --git a/src/squick/core/property_manager.h → src/core/property_manager.h b/src/squick/core/property_manager.h → src/core/property_manager.h
diff --git a/src/squick/core/queue.h → src/core/queue.h b/src/squick/core/queue.h → src/core/queue.h
diff --git a/src/squick/core/record.cc → src/core/record.cc b/src/squick/core/record.cc → src/core/record.cc
diff --git a/src/squick/core/record.h → src/core/record.h b/src/squick/core/record.h → src/core/record.h
diff --git a/src/squick/core/recordManager.cc → src/core/recordManager.cc b/src/squick/core/recordManager.cc → src/core/recordManager.cc
diff --git a/src/squick/core/record_manager.h → src/core/record_manager.h b/src/squick/core/record_manager.h → src/core/record_manager.h
diff --git a/src/squick/core/smart_enum.h → src/core/smart_enum.h b/src/squick/core/smart_enum.h → src/core/smart_enum.h
diff --git a/src/squick/core/string_ring_buffer.h → src/core/string_ring_buffer.h b/src/squick/core/string_ring_buffer.h → src/core/string_ring_buffer.h
diff --git a/src/squick/core/termcolor.h → src/core/termcolor.h b/src/squick/core/termcolor.h → src/core/termcolor.h
diff --git a/src/squick/core/vector2.h → src/core/vector2.h b/src/squick/core/vector2.h → src/core/vector2.h
diff --git a/src/squick/core/vector3.h → src/core/vector3.h b/src/squick/core/vector3.h → src/core/vector3.h
diff --git a/src/squick/core/vector4.h → src/core/vector4.h b/src/squick/core/vector4.h → src/core/vector4.h
diff --git a/src/main.cc b/src/main.cc
@@ -1,6 +1,6 @@
 #include <iostream>
-#include <squick/core/base.h>
-#include <squick/core/plugin_server.h>
+#include <core/base.h>
+#include <core/plugin_server.h>
 #include <struct/struct.h>
 
 #if PLATFORM == PLATFORM_WIN

diff --git a/src/plugin/CMakeLists.txt b/src/plugin/CMakeLists.txt
@@ -0,0 +1,6 @@
+add_subdirectory(core)
+add_subdirectory(node)
+
+if( MODE STREQUAL "dev" )
+    add_subdirectory(tutorial)
+endif()
diff --git a/src/squick/plugin/CMakeLists.txt → src/plugin/core/CMakeLists.txt b/src/squick/plugin/CMakeLists.txt → src/plugin/core/CMakeLists.txt
diff --git a/src/squick/plugin/actor/CMakeLists.txt → src/plugin/core/actor/CMakeLists.txt b/src/squick/plugin/actor/CMakeLists.txt → src/plugin/core/actor/CMakeLists.txt
diff --git a/src/squick/plugin/actor/actor.cc → src/plugin/core/actor/actor.cc b/src/squick/plugin/actor/actor.cc → src/plugin/core/actor/actor.cc
@@ -1,5 +1,5 @@
 #include "actor.h"
-#include <squick/core/i_plugin_manager.h>
+#include <core/i_plugin_manager.h>
 
 Actor::Actor(const Guid id, IActorModule *pModule) {
     this->id = id;

diff --git a/src/squick/plugin/actor/actor.h → src/plugin/core/actor/actor.h b/src/squick/plugin/actor/actor.h → src/plugin/core/actor/actor.h
@@ -3,10 +3,10 @@
 #include "i_actor_module.h"
 #include "i_component_module.h"
 #include <map>
-#include <squick/core/guid.h>
-#include <squick/core/map_ex.h>
-#include <squick/core/platform.h>
-#include <squick/core/queue.h>
+#include <core/guid.h>
+#include <core/map_ex.h>
+#include <core/platform.h>
+#include <core/queue.h>
 #include <string>
 
 class Actor : public IActor {

diff --git a/src/squick/plugin/actor/actor_module.cc → src/plugin/core/actor/actor_module.cc b/src/squick/plugin/actor/actor_module.cc → src/plugin/core/actor/actor_module.cc
diff --git a/src/squick/plugin/actor/actor_module.h → src/plugin/core/actor/actor_module.h b/src/squick/plugin/actor/actor_module.h → src/plugin/core/actor/actor_module.h
@@ -4,8 +4,8 @@
 #include <queue>
 #include <string>
 
-#include <squick/core/queue.h>
-#include <squick/plugin/thread/export.h>
+#include <core/queue.h>
+#include <plugin/core/thread/export.h>
 
 #include "actor.h"
 #include "i_actor_module.h"

diff --git a/src/squick/plugin/actor/export.h → src/plugin/core/actor/export.h b/src/squick/plugin/actor/export.h → src/plugin/core/actor/export.h
diff --git a/src/squick/plugin/actor/i_actor_module.h → src/plugin/core/actor/i_actor_module.h b/src/squick/plugin/actor/i_actor_module.h → src/plugin/core/actor/i_actor_module.h
@@ -1,6 +1,6 @@
 #pragma once
 #include "i_component_module.h"
-#include <squick/core/i_module.h>
+#include <core/i_module.h>
 
 class IActorModule : public IModule {
   public:

diff --git a/src/squick/plugin/actor/i_component_module.h → src/plugin/core/actor/i_component_module.h b/src/squick/plugin/actor/i_component_module.h → src/plugin/core/actor/i_component_module.h
@@ -1,9 +1,9 @@
 #pragma once
 #include <memory>
-#include <squick/core/guid.h>
-#include <squick/core/i_module.h>
-#include <squick/core/memory_counter.h>
-#include <squick/core/platform.h>
+#include <core/guid.h>
+#include <core/i_module.h>
+#include <core/memory_counter.h>
+#include <core/platform.h>
 
 class ActorMessage;
 class IComponent;

diff --git a/src/squick/plugin/actor/plugin.cc → src/plugin/core/actor/plugin.cc b/src/squick/plugin/actor/plugin.cc → src/plugin/core/actor/plugin.cc
@@ -1,6 +1,6 @@
 #include "plugin.h"
 #include "actor_module.h"
-#include <squick/core/i_module.h>
+#include <core/i_module.h>
 
 SQUICK_EXPORT void SquickPluginLoad(IPluginManager *pm){CREATE_PLUGIN(pm, ActorPlugin)};
 

diff --git a/src/squick/plugin/actor/plugin.h → src/plugin/core/actor/plugin.h b/src/squick/plugin/actor/plugin.h → src/plugin/core/actor/plugin.h
@@ -1,6 +1,6 @@
 
-#include <squick/core/i_plugin.h>
-#include <squick/core/i_plugin_manager.h>
+#include <core/i_plugin.h>
+#include <core/i_plugin_manager.h>
 
 //////////////////////////////////////////////////////////////////////////
 class ActorPlugin : public IPlugin {

diff --git a/src/squick/plugin/config/CMakeLists.txt → src/plugin/core/config/CMakeLists.txt b/src/squick/plugin/config/CMakeLists.txt → src/plugin/core/config/CMakeLists.txt
diff --git a/src/squick/plugin/config/class_module.cc → src/plugin/core/config/class_module.cc b/src/squick/plugin/config/class_module.cc → src/plugin/core/config/class_module.cc
diff --git a/src/squick/plugin/config/class_module.cc~ → src/plugin/core/config/class_module.cc~ b/src/squick/plugin/config/class_module.cc~ → src/plugin/core/config/class_module.cc~
diff --git a/src/squick/plugin/config/class_module.h → src/plugin/core/config/class_module.h b/src/squick/plugin/config/class_module.h → src/plugin/core/config/class_module.h
@@ -5,13 +5,13 @@
 #include "i_element_module.h"
 #include <iostream>
 #include <map>
-#include <squick/core/data_list.h>
-#include <squick/core/i_plugin_manager.h>
-#include <squick/core/list.h>
-#include <squick/core/map.h>
-#include <squick/core/property_manager.h>
-#include <squick/core/record.h>
-#include <squick/core/record_manager.h>
+#include <core/data_list.h>
+#include <core/i_plugin_manager.h>
+#include <core/list.h>
+#include <core/map.h>
+#include <core/property_manager.h>
+#include <core/record.h>
+#include <core/record_manager.h>
 #include <string>
 #include <third_party/rapidxml/rapidxml.hpp>
 #include <thread>

diff --git a/src/squick/plugin/config/config_module.cc → src/plugin/core/config/config_module.cc b/src/squick/plugin/config/config_module.cc → src/plugin/core/config/config_module.cc
diff --git a/src/squick/plugin/config/config_module.h → src/plugin/core/config/config_module.h b/src/squick/plugin/config/config_module.h → src/plugin/core/config/config_module.h
@@ -1,9 +1,9 @@
 #pragma once
 
 #include "i_common_config_module.h"
-#include <squick/core/i_plugin_manager.h>
-#include <squick/core/map_ex.h>
-#include <squick/core/platform.h>
+#include <core/i_plugin_manager.h>
+#include <core/map_ex.h>
+#include <core/platform.h>
 class ConfigModule : public ICommonConfigModule {
   public:
   public:

diff --git a/src/squick/plugin/config/element_module.cc → src/plugin/core/config/element_module.cc b/src/squick/plugin/config/element_module.cc → src/plugin/core/config/element_module.cc
diff --git a/src/squick/plugin/config/element_module.h → src/plugin/core/config/element_module.h b/src/squick/plugin/config/element_module.h → src/plugin/core/config/element_module.h
@@ -4,13 +4,13 @@
 #include "i_element_module.h"
 #include <iostream>
 #include <map>
-#include <squick/core/data_list.h>
-#include <squick/core/list.h>
-#include <squick/core/map.h>
-#include <squick/core/property_manager.h>
-#include <squick/core/record.h>
-#include <squick/core/record_manager.h>
-#include <squick/plugin/log/i_log_module.h>
+#include <core/data_list.h>
+#include <core/list.h>
+#include <core/map.h>
+#include <core/property_manager.h>
+#include <core/record.h>
+#include <core/record_manager.h>
+#include <plugin/core/log/i_log_module.h>
 #include <string>
 #include <third_party/rapidxml/rapidxml.hpp>
 #include <third_party/rapidxml/rapidxml_iterators.hpp>

diff --git a/src/squick/plugin/config/export.h → src/plugin/core/config/export.h b/src/squick/plugin/config/export.h → src/plugin/core/config/export.h
diff --git a/src/squick/plugin/config/i_class_module.h → src/plugin/core/config/i_class_module.h b/src/squick/plugin/config/i_class_module.h → src/plugin/core/config/i_class_module.h
@@ -3,8 +3,8 @@
 #define SQUICK_INTF_LOGICCLASS_MODULE_H
 
 #include <iostream>
-#include <squick/core/i_module.h>
-#include <squick/core/i_object.h>
+#include <core/i_module.h>
+#include <core/i_object.h>
 
 typedef std::function<int(const Guid &, const std::string &, const CLASS_OBJECT_EVENT, const DataList &)> CLASS_EVENT_FUNCTOR;
 typedef std::shared_ptr<CLASS_EVENT_FUNCTOR> CLASS_EVENT_FUNCTOR_PTR; // EVENT

diff --git a/...ck/plugin/config/i_common_config_module.h → ...ugin/core/config/i_common_config_module.h b/...ck/plugin/config/i_common_config_module.h → ...ugin/core/config/i_common_config_module.h
@@ -4,7 +4,7 @@
 #define SQUICK_INTF_COMMONCONFIG_MODULE_H
 
 #include <iostream>
-#include <squick/core/i_module.h>
+#include <core/i_module.h>
 
 class ICommonConfigModule : public IModule {
   public:

diff --git a/src/squick/plugin/config/i_element_module.h → src/plugin/core/config/i_element_module.h b/src/squick/plugin/config/i_element_module.h → src/plugin/core/config/i_element_module.h
@@ -1,10 +1,10 @@
 #pragma once
 
 #include <iostream>
-#include <squick/core/data_list.h>
-#include <squick/core/i_module.h>
-#include <squick/core/property_manager.h>
-#include <squick/core/record_manager.h>
+#include <core/data_list.h>
+#include <core/i_module.h>
+#include <core/property_manager.h>
+#include <core/record_manager.h>
 
 class IElementModule : public IModule {
   public:

diff --git a/src/squick/plugin/config/myrc4.cc → src/plugin/core/config/myrc4.cc b/src/squick/plugin/config/myrc4.cc → src/plugin/core/config/myrc4.cc
diff --git a/src/squick/plugin/config/myrc4.h → src/plugin/core/config/myrc4.h b/src/squick/plugin/config/myrc4.h → src/plugin/core/config/myrc4.h
diff --git a/src/squick/plugin/config/plugin.cc → src/plugin/core/config/plugin.cc b/src/squick/plugin/config/plugin.cc → src/plugin/core/config/plugin.cc
diff --git a/src/squick/plugin/config/plugin.h → src/plugin/core/config/plugin.h b/src/squick/plugin/config/plugin.h → src/plugin/core/config/plugin.h
@@ -1,6 +1,6 @@
 
-#include <squick/core/i_plugin.h>
-#include <squick/core/i_plugin_manager.h>
+#include <core/i_plugin.h>
+#include <core/i_plugin_manager.h>
 //////////////////////////////////////////////////////////////////////////
 class ConfigPlugin : public IPlugin {
   public:

diff --git a/src/squick/plugin/log/CMakeLists.txt → src/plugin/core/log/CMakeLists.txt b/src/squick/plugin/log/CMakeLists.txt → src/plugin/core/log/CMakeLists.txt
diff --git a/src/squick/plugin/log/export.h → src/plugin/core/log/export.h b/src/squick/plugin/log/export.h → src/plugin/core/log/export.h
@@ -4,5 +4,5 @@
 // Github: https://github.com/pwnsky/squick
 // Description: Export current plugin's all modules in a single header file
 #pragma once
-// #include <squick/core/easylogging++.h>
+// #include <core/easylogging++.h>
 #include "i_log_module.h"
diff --git a/src/squick/plugin/log/i_log_module.h → src/plugin/core/log/i_log_module.h b/src/squick/plugin/log/i_log_module.h → src/plugin/core/log/i_log_module.h
@@ -1,8 +1,8 @@
 
 #pragma once
 
-#include <squick/core/base.h>
-#include <squick/core/i_module.h>
+#include <core/base.h>
+#include <core/i_module.h>
 #include <third_party/easyloggingpp/easylogging++.h>
 
 #ifdef SQUICK_DEV

diff --git a/src/squick/plugin/log/log_module.cc → src/plugin/core/log/log_module.cc b/src/squick/plugin/log/log_module.cc → src/plugin/core/log/log_module.cc
@@ -3,8 +3,8 @@
 #include "log_module.h"
 
 #include "plugin.h"
-#include "squick/core/exception.h"
-#include <squick/core/termcolor.h>
+#include "core/exception.h"
+#include <core/termcolor.h>
 #include <stdarg.h>
 
 // Ref https://github.com/abumq/easyloggingpp;

diff --git a/src/squick/plugin/log/log_module.h → src/plugin/core/log/log_module.h b/src/squick/plugin/log/log_module.h → src/plugin/core/log/log_module.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "i_log_module.h"
-#include <squick/core/performance.h>
+#include <core/performance.h>
 
 class LogModule : public ILogModule {
   public:

diff --git a/src/squick/plugin/log/plugin.cc → src/plugin/core/log/plugin.cc b/src/squick/plugin/log/plugin.cc → src/plugin/core/log/plugin.cc
diff --git a/src/squick/plugin/log/plugin.h → src/plugin/core/log/plugin.h b/src/squick/plugin/log/plugin.h → src/plugin/core/log/plugin.h
@@ -1,6 +1,6 @@
 #pragma once
-#include <squick/core/i_plugin.h>
-#include <squick/core/i_plugin_manager.h>
+#include <core/i_plugin.h>
+#include <core/i_plugin_manager.h>
 class LogPlugin : public IPlugin {
   public:
     LogPlugin(IPluginManager *p) { pm_ = p; }

diff --git a/src/squick/plugin/lua/CMakeLists.txt → src/plugin/core/lua/CMakeLists.txt b/src/squick/plugin/lua/CMakeLists.txt → src/plugin/core/lua/CMakeLists.txt
diff --git a/src/squick/plugin/lua/export.h → src/plugin/core/lua/export.h b/src/squick/plugin/lua/export.h → src/plugin/core/lua/export.h
diff --git a/src/squick/plugin/lua/lua_pb_module.cc → src/plugin/core/lua/lua_pb_module.cc b/src/squick/plugin/lua/lua_pb_module.cc → src/plugin/core/lua/lua_pb_module.cc
diff --git a/src/squick/plugin/lua/lua_pb_module.h → src/plugin/core/lua/lua_pb_module.h b/src/squick/plugin/lua/lua_pb_module.h → src/plugin/core/lua/lua_pb_module.h
@@ -11,10 +11,10 @@
 #include <google/protobuf/descriptor.h>
 #include <google/protobuf/descriptor.pb.h>
 #include <google/protobuf/dynamic_message.h>
-#include <squick/core/base.h>
-#include <squick/plugin/log/i_log_module.h>
+#include <core/base.h>
+#include <plugin/core/log/i_log_module.h>
 #if PLATFORM != PLATFORM_WIN
-#include "squick/core/exception.h"
+#include "core/exception.h"
 #endif
 
 class MultiFileErrorCollector : public google::protobuf::compiler::MultiFileErrorCollector {

diff --git a/src/squick/plugin/lua/lua_script_module.cc → src/plugin/core/lua/lua_script_module.cc b/src/squick/plugin/lua/lua_script_module.cc → src/plugin/core/lua/lua_script_module.cc
diff --git a/src/squick/plugin/lua/lua_script_module.h → src/plugin/core/lua/lua_script_module.h b/src/squick/plugin/lua/lua_script_module.h → src/plugin/core/lua/lua_script_module.h
@@ -8,11 +8,11 @@
 // #define LUAINTF_LINK_LUA_COMPILED_IN_CXX 0
 
 #include "lua_pb_module.h"
-#include <squick/plugin/config/export.h>
-#include <squick/plugin/log/export.h>
-#include <squick/plugin/net/export.h>
-#include <squick/plugin/utils/export.h>
-#include <squick/plugin/world/export.h>
+#include <plugin/core/config/export.h>
+#include <plugin/core/log/export.h>
+#include <plugin/core/net/export.h>
+#include <plugin/core/utils/export.h>
+#include <plugin/core/world/export.h>
 #define LUA_UPDATE_INTERVAL_TIME 100 // ms
 
 #if PLATFORM == PLATFORM_WIN

diff --git a/src/squick/plugin/lua/plugin.cc → src/plugin/core/lua/plugin.cc b/src/squick/plugin/lua/plugin.cc → src/plugin/core/lua/plugin.cc
diff --git a/src/squick/plugin/lua/plugin.h → src/plugin/core/lua/plugin.h b/src/squick/plugin/lua/plugin.h → src/plugin/core/lua/plugin.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <squick/core/i_plugin.h>
-#include <squick/core/i_plugin_manager.h>
+#include <core/i_plugin.h>
+#include <core/i_plugin_manager.h>
 
 class LuaScriptPlugin : public IPlugin {
   public:

diff --git a/src/squick/plugin/navigation/CMakeLists.txt → src/plugin/core/navigation/CMakeLists.txt b/src/squick/plugin/navigation/CMakeLists.txt → src/plugin/core/navigation/CMakeLists.txt
diff --git a/src/squick/plugin/navigation/export.h → src/plugin/core/navigation/export.h b/src/squick/plugin/navigation/export.h → src/plugin/core/navigation/export.h
diff --git a/...gin/navigation/i_navigation_data_module.h → ...ore/navigation/i_navigation_data_module.h b/...gin/navigation/i_navigation_data_module.h → ...ore/navigation/i_navigation_data_module.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include <squick/core/guid.h>
-#include <squick/core/i_module.h>
-#include <squick/core/map.h>
-#include <squick/core/vector3.h>
+#include <core/guid.h>
+#include <core/i_module.h>
+#include <core/map.h>
+#include <core/vector3.h>
 #include <third_party/ajson/ajson.hpp>
 #include <third_party/nlohmann/json.hpp>
 using json = nlohmann::json;

diff --git a/...k/plugin/navigation/i_navigation_module.h → ...gin/core/navigation/i_navigation_module.h b/...k/plugin/navigation/i_navigation_module.h → ...gin/core/navigation/i_navigation_module.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <squick/core/i_module.h>
+#include <core/i_module.h>
 
 class INavigationModule : public IModule {
   public:

diff --git a/...ugin/navigation/navigation_data_module.cc → ...core/navigation/navigation_data_module.cc b/...ugin/navigation/navigation_data_module.cc → ...core/navigation/navigation_data_module.cc
diff --git a/...lugin/navigation/navigation_data_module.h → .../core/navigation/navigation_data_module.h b/...lugin/navigation/navigation_data_module.h → .../core/navigation/navigation_data_module.h
@@ -1,15 +1,15 @@
 #pragma once
 #include <memory>
-#include <squick/plugin/config/export.h>
-#include <squick/plugin/log/export.h>
-#include <squick/plugin/net/export.h>
-#include <squick/plugin/utils/export.h>
-#include <squick/plugin/world/export.h>
+#include <plugin/core/config/export.h>
+#include <plugin/core/log/export.h>
+#include <plugin/core/net/export.h>
+#include <plugin/core/utils/export.h>
+#include <plugin/core/world/export.h>
 // #include "squick/base/no_sql.h"
 #include "i_navigation_data_module.h"
 
-// #include "server/game/plugin/server/if_server_module.h"
-// #include "server/game/plugin/client/if_world_module.h"
+// #include "server/game/plugin/core/server/if_server_module.h"
+// #include "server/game/plugin/core/client/if_world_module.h"
 ////////////////////////////////////////////////////////////////////////////
 
 class NavigationDataModule : public INavigationDataModule {

diff --git a/...ck/plugin/navigation/navigation_module.cc → ...ugin/core/navigation/navigation_module.cc b/...ck/plugin/navigation/navigation_module.cc → ...ugin/core/navigation/navigation_module.cc