diff --git a/chfs-ng/.dockerignore b/.dockerignore
similarity index 100%
rename from chfs-ng/.dockerignore
rename to .dockerignore
diff --git a/chfs-ng/Dockerfile b/Dockerfile
similarity index 100%
rename from chfs-ng/Dockerfile
rename to Dockerfile
diff --git a/chfs-ng/Makefile b/Makefile
similarity index 100%
rename from chfs-ng/Makefile
rename to Makefile
diff --git a/PlexPt b/PlexPt
deleted file mode 160000
index 21afcc3..0000000
--- a/PlexPt
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 21afcc303467f8aa04a3a3d8d0baa59e3d773732
diff --git a/chfs-ng/README.md b/README.md
similarity index 100%
rename from chfs-ng/README.md
rename to README.md
diff --git a/chfs-ng/cmd/chfs/main.go b/cmd/chfs/main.go
similarity index 100%
rename from chfs-ng/cmd/chfs/main.go
rename to cmd/chfs/main.go
diff --git a/chfs-ng/deploy/docker-compose.yml b/deploy/docker-compose.yml
similarity index 100%
rename from chfs-ng/deploy/docker-compose.yml
rename to deploy/docker-compose.yml
diff --git a/compatibility/api-v1.md b/docs/research/compatibility/api-v1.md
similarity index 100%
rename from compatibility/api-v1.md
rename to docs/research/compatibility/api-v1.md
diff --git a/compatibility/config-v1.md b/docs/research/compatibility/config-v1.md
similarity index 100%
rename from compatibility/config-v1.md
rename to docs/research/compatibility/config-v1.md
diff --git a/original/chfs-v4.0beta.min.bin b/docs/research/original/chfs-v4.0beta.min.bin
similarity index 100%
rename from original/chfs-v4.0beta.min.bin
rename to docs/research/original/chfs-v4.0beta.min.bin
diff --git a/original/chfs-v4.0beta.min.ini b/docs/research/original/chfs-v4.0beta.min.ini
similarity index 100%
rename from original/chfs-v4.0beta.min.ini
rename to docs/research/original/chfs-v4.0beta.min.ini
diff --git a/reverse/architecture.md b/docs/research/reverse/architecture.md
similarity index 100%
rename from reverse/architecture.md
rename to docs/research/reverse/architecture.md
diff --git a/reverse/functions.txt b/docs/research/reverse/functions.txt
similarity index 100%
rename from reverse/functions.txt
rename to docs/research/reverse/functions.txt
diff --git a/chfs-ng/go.mod b/go.mod
similarity index 100%
rename from chfs-ng/go.mod
rename to go.mod
diff --git a/chfs-ng/go.sum b/go.sum
similarity index 100%
rename from chfs-ng/go.sum
rename to go.sum
diff --git a/chfs-ng/internal/api/folder_download_test.go b/internal/api/folder_download_test.go
similarity index 100%
rename from chfs-ng/internal/api/folder_download_test.go
rename to internal/api/folder_download_test.go
diff --git a/chfs-ng/internal/api/health.go b/internal/api/health.go
similarity index 100%
rename from chfs-ng/internal/api/health.go
rename to internal/api/health.go
diff --git a/chfs-ng/internal/api/path_security_test.go b/internal/api/path_security_test.go
similarity index 100%
rename from chfs-ng/internal/api/path_security_test.go
rename to internal/api/path_security_test.go
diff --git a/chfs-ng/internal/api/permission_matrix_test.go b/internal/api/permission_matrix_test.go
similarity index 100%
rename from chfs-ng/internal/api/permission_matrix_test.go
rename to internal/api/permission_matrix_test.go
diff --git a/chfs-ng/internal/api/root_handler_test.go b/internal/api/root_handler_test.go
similarity index 100%
rename from chfs-ng/internal/api/root_handler_test.go
rename to internal/api/root_handler_test.go
diff --git a/chfs-ng/internal/api/server.go b/internal/api/server.go
similarity index 100%
rename from chfs-ng/internal/api/server.go
rename to internal/api/server.go
diff --git a/chfs-ng/internal/api/share_archive_test.go b/internal/api/share_archive_test.go
similarity index 100%
rename from chfs-ng/internal/api/share_archive_test.go
rename to internal/api/share_archive_test.go
diff --git a/chfs-ng/internal/api/upload_compat_test.go b/internal/api/upload_compat_test.go
similarity index 100%
rename from chfs-ng/internal/api/upload_compat_test.go
rename to internal/api/upload_compat_test.go
diff --git a/chfs-ng/internal/api/user_management_test.go b/internal/api/user_management_test.go
similarity index 100%
rename from chfs-ng/internal/api/user_management_test.go
rename to internal/api/user_management_test.go
diff --git a/chfs-ng/internal/api/web/index.html b/internal/api/web/index.html
similarity index 100%
rename from chfs-ng/internal/api/web/index.html
rename to internal/api/web/index.html
diff --git a/chfs-ng/internal/api/webdav_permission_matrix_test.go b/internal/api/webdav_permission_matrix_test.go
similarity index 100%
rename from chfs-ng/internal/api/webdav_permission_matrix_test.go
rename to internal/api/webdav_permission_matrix_test.go
diff --git a/chfs-ng/internal/api/webdav_test.go b/internal/api/webdav_test.go
similarity index 100%
rename from chfs-ng/internal/api/webdav_test.go
rename to internal/api/webdav_test.go
diff --git a/chfs-ng/internal/auth/auth.go b/internal/auth/auth.go
similarity index 100%
rename from chfs-ng/internal/auth/auth.go
rename to internal/auth/auth.go
diff --git a/chfs-ng/internal/auth/auth_test.go b/internal/auth/auth_test.go
similarity index 100%
rename from chfs-ng/internal/auth/auth_test.go
rename to internal/auth/auth_test.go
diff --git a/chfs-ng/internal/auth/rules_test.go b/internal/auth/rules_test.go
similarity index 100%
rename from chfs-ng/internal/auth/rules_test.go
rename to internal/auth/rules_test.go
diff --git a/chfs-ng/internal/auth/users.go b/internal/auth/users.go
similarity index 100%
rename from chfs-ng/internal/auth/users.go
rename to internal/auth/users.go
diff --git a/chfs-ng/internal/config/config.go b/internal/config/config.go
similarity index 100%
rename from chfs-ng/internal/config/config.go
rename to internal/config/config.go
diff --git a/chfs-ng/internal/config/config_test.go b/internal/config/config_test.go
similarity index 100%
rename from chfs-ng/internal/config/config_test.go
rename to internal/config/config_test.go
diff --git a/chfs-ng/internal/opslog/opslog.go b/internal/opslog/opslog.go
similarity index 100%
rename from chfs-ng/internal/opslog/opslog.go
rename to internal/opslog/opslog.go
diff --git a/chfs-ng/internal/storage/multipath.go b/internal/storage/multipath.go
similarity index 100%
rename from chfs-ng/internal/storage/multipath.go
rename to internal/storage/multipath.go
diff --git a/chfs-ng/internal/storage/multipath_test.go b/internal/storage/multipath_test.go
similarity index 100%
rename from chfs-ng/internal/storage/multipath_test.go
rename to internal/storage/multipath_test.go
diff --git a/chfs-ng/internal/storage/storage.go b/internal/storage/storage.go
similarity index 100%
rename from chfs-ng/internal/storage/storage.go
rename to internal/storage/storage.go
diff --git a/chfs-ng/internal/storage/storage_test.go b/internal/storage/storage_test.go
similarity index 100%
rename from chfs-ng/internal/storage/storage_test.go
rename to internal/storage/storage_test.go
diff --git a/luguo b/luguo
deleted file mode 160000
index 75ea2d5..0000000
--- a/luguo
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 75ea2d59d6ae97dea9e5157b3833ceb0aafb8d22
diff --git a/vlianx b/vlianx
deleted file mode 160000
index abe33d8..0000000
--- a/vlianx
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit abe33d893c0ef29c08a23e93619be94c5ddcb124