diff --git a/libs/movex-master/tsconfig.spec.json b/libs/movex-master/tsconfig.spec.json
index 2df87730..cfc9feb6 100644
--- a/libs/movex-master/tsconfig.spec.json
+++ b/libs/movex-master/tsconfig.spec.json
@@ -3,7 +3,10 @@
   "compilerOptions": {
     "outDir": "../../dist/out-tsc",
     "module": "commonjs",
-    "types": ["jest", "node"]
+    "types": [
+      "jest",
+      "node"
+    ]
   },
   "include": [
     "jest.config.ts",
@@ -16,5 +19,5 @@
     "**/*.test.jsx",
     "**/*.spec.jsx",
     "**/*.d.ts"
-, "../movex/src/lib/client/MovexResourceObservable.spec.ts"  ]
-}
+  ]
+}
\ No newline at end of file
diff --git a/libs/movex/package.json b/libs/movex/package.json
index 86774008..c118e9d0 100644
--- a/libs/movex/package.json
+++ b/libs/movex/package.json
@@ -1,6 +1,6 @@
 {
   "name": "movex",
-  "version": "0.1.3-2",
+  "version": "0.1.3-9",
   "license": "MIT",
   "description": "Movex is a Multiplayer (Game) State Synchronization Library using Deterministic Action Propagation without the need to write Server Specific Code.",
   "author": {
diff --git a/libs/movex/src/index.ts b/libs/movex/src/index.ts
index dd13ec07..5379bbd3 100644
--- a/libs/movex/src/index.ts
+++ b/libs/movex/src/index.ts
@@ -1,7 +1,7 @@
 export * from './lib';
 
 // Aliased
-export * as MovexClient from './lib/client';
+export * as MovexClient from './lib';
 
 export {
   type ResourceIdentifier,
diff --git a/libs/movex/src/lib/client/ConnectionToMasterResource.ts b/libs/movex/src/lib/ConnectionToMasterResource.ts
similarity index 100%
rename from libs/movex/src/lib/client/ConnectionToMasterResource.ts
rename to libs/movex/src/lib/ConnectionToMasterResource.ts
diff --git a/libs/movex/src/lib/client/Movex.ts b/libs/movex/src/lib/Movex.ts
similarity index 100%
rename from libs/movex/src/lib/client/Movex.ts
rename to libs/movex/src/lib/Movex.ts
diff --git a/libs/movex/src/lib/client/MovexBoundResource.ts b/libs/movex/src/lib/MovexBoundResource.ts
similarity index 100%
rename from libs/movex/src/lib/client/MovexBoundResource.ts
rename to libs/movex/src/lib/MovexBoundResource.ts
diff --git a/libs/movex/src/lib/client/MovexFromDefintion.ts b/libs/movex/src/lib/MovexFromDefintion.ts
similarity index 100%
rename from libs/movex/src/lib/client/MovexFromDefintion.ts
rename to libs/movex/src/lib/MovexFromDefintion.ts
diff --git a/libs/movex/src/lib/client/MovexResource.ts b/libs/movex/src/lib/MovexResource.ts
similarity index 100%
rename from libs/movex/src/lib/client/MovexResource.ts
rename to libs/movex/src/lib/MovexResource.ts
diff --git a/libs/movex/src/lib/client/MovexResourceObservable.spec.ts b/libs/movex/src/lib/MovexResourceObservable.spec.ts
similarity index 100%
rename from libs/movex/src/lib/client/MovexResourceObservable.spec.ts
rename to libs/movex/src/lib/MovexResourceObservable.spec.ts
diff --git a/libs/movex/src/lib/client/MovexResourceObservable.ts b/libs/movex/src/lib/MovexResourceObservable.ts
similarity index 100%
rename from libs/movex/src/lib/client/MovexResourceObservable.ts
rename to libs/movex/src/lib/MovexResourceObservable.ts
diff --git a/libs/movex/src/lib/client/index.ts b/libs/movex/src/lib/client/index.ts
deleted file mode 100644
index 661067e7..00000000
--- a/libs/movex/src/lib/client/index.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export * from './Movex';
-export * from './init';
-export * from './MovexResource';
-export * from './MovexBoundResource';
-export * from './MovexFromDefintion';
diff --git a/libs/movex/src/lib/client/todo b/libs/movex/src/lib/client/todo
deleted file mode 100644
index c3468229..00000000
--- a/libs/movex/src/lib/client/todo
+++ /dev/null
@@ -1 +0,0 @@
-This can be the actual movex once the master moves into it's own lib. Here just temporary
\ No newline at end of file
diff --git a/libs/movex/src/lib/client/dispatch.ts b/libs/movex/src/lib/dispatch.ts
similarity index 100%
rename from libs/movex/src/lib/client/dispatch.ts
rename to libs/movex/src/lib/dispatch.ts
diff --git a/libs/movex/src/lib/index.ts b/libs/movex/src/lib/index.ts
index 276720aa..661067e7 100644
--- a/libs/movex/src/lib/index.ts
+++ b/libs/movex/src/lib/index.ts
@@ -1,2 +1,5 @@
-export * from './client/Movex';
-export * from './client/MovexFromDefintion';
+export * from './Movex';
+export * from './init';
+export * from './MovexResource';
+export * from './MovexBoundResource';
+export * from './MovexFromDefintion';
diff --git a/libs/movex/src/lib/client/init.ts b/libs/movex/src/lib/init.ts
similarity index 100%
rename from libs/movex/src/lib/client/init.ts
rename to libs/movex/src/lib/init.ts