diff --git a/share/builtin/client_file/client_file.cpp b/builtin/client_file/client_file.cpp
similarity index 100%
rename from share/builtin/client_file/client_file.cpp
rename to builtin/client_file/client_file.cpp
diff --git a/share/builtin/client_file/include/api.h b/builtin/client_file/include/api.h
similarity index 100%
rename from share/builtin/client_file/include/api.h
rename to builtin/client_file/include/api.h
diff --git a/share/builtin/client_lua/client_lua.cpp b/builtin/client_lua/client_lua.cpp
similarity index 100%
rename from share/builtin/client_lua/client_lua.cpp
rename to builtin/client_lua/client_lua.cpp
diff --git a/share/builtin/client_lua/include/api.h b/builtin/client_lua/include/api.h
similarity index 100%
rename from share/builtin/client_lua/include/api.h
rename to builtin/client_lua/include/api.h
diff --git a/share/builtin/network/include/api.h b/builtin/network/include/api.h
similarity index 100%
rename from share/builtin/network/include/api.h
rename to builtin/network/include/api.h
diff --git a/share/builtin/network/network.cpp b/builtin/network/network.cpp
similarity index 100%
rename from share/builtin/network/network.cpp
rename to builtin/network/network.cpp
diff --git a/share/default.pak b/client/default.pak
similarity index 100%
rename from share/default.pak
rename to client/default.pak
diff --git a/share/client/init.lua b/client/init.lua
similarity index 100%
rename from share/client/init.lua
rename to client/init.lua
diff --git a/share/client/packet.lua b/client/packet.lua
similarity index 100%
rename from share/client/packet.lua
rename to client/packet.lua
diff --git a/share/client/sandbox.lua b/client/sandbox.lua
similarity index 100%
rename from share/client/sandbox.lua
rename to client/sandbox.lua
diff --git a/share/client/test.lua b/client/test.lua
similarity index 100%
rename from share/client/test.lua
rename to client/test.lua
diff --git a/conventions.txt b/conventions.txt
index 0ec4de7..4cf4670 100644
--- a/conventions.txt
+++ b/conventions.txt
@@ -52,8 +52,9 @@ Directory structure
 ├── 3rdparty    << Bundled 3rd-party libraries
 ├── build       << Build files; always mkdir build; cmake .. to keep things clean
 ├── cache       << Runtime directory used by Buildat
-├── share       << Static files; installable in /usr/share/buildat
-│   └── builtin << Built-in modules
+├── builtin     << Built-in modules
+├── client      << Built-in client files
+├── extensions  << Built-in client extensions
 ├── src
 │   ├── client  << Client-specific code
 │   ├── core    << Core code (must be kept minimal but sufficient)
diff --git a/src/client/app.cpp b/src/client/app.cpp
index 6788218..8bec7d0 100644
--- a/src/client/app.cpp
+++ b/src/client/app.cpp
@@ -195,7 +195,7 @@ struct CApp: public Polycode::EventHandler, public App
 		core = new POLYCODE_CORE(view, 640, 480, false, false, 0, 0, 90, 1, true);
 
 		Polycode::CoreServices::getInstance()->getResourceManager()->addArchive(
-				g_client_config.share_path+"/default.pak");
+				g_client_config.share_path+"/client/default.pak");
 		Polycode::CoreServices::getInstance()->getResourceManager()->addDirResource("default",
 				false);
 
diff --git a/src/client/config.h b/src/client/config.h
index 10648ac..c2a4788 100644
--- a/src/client/config.h
+++ b/src/client/config.h
@@ -7,7 +7,7 @@ namespace client
 	{
 		ss_ server_address;
 		ss_ polycode_path = "/home/celeron55/softat/polycode/";
-		ss_ share_path = "../share";
+		ss_ share_path = "..";
 		ss_ cache_path = "../cache";
 	};
 }
diff --git a/src/server/config.h b/src/server/config.h
index 8676cd1..5e970db 100644
--- a/src/server/config.h
+++ b/src/server/config.h
@@ -7,7 +7,7 @@ namespace server
 	{
 		ss_ rccpp_build_path = "../cache/rccpp_build";
 		ss_ interface_path = "../src/interface";
-		ss_ share_path = "../share";
+		ss_ share_path = "..";
 	};
 }