diff --git a/common/entity.js b/common/entity.js
new file mode 100644
index 00000000..0aa9ab40
--- /dev/null
+++ b/common/entity.js
@@ -0,0 +1,4 @@
+'use strict';
+
+module.exports = require('../server/common/entity');
+
diff --git a/common/store.js b/common/store.js
index 7a94054f..88b1ca13 100644
--- a/common/store.js
+++ b/common/store.js
@@ -1,13 +1,4 @@
 'use strict';
 
-module.exports = () => {
-    const data = {};
-    
-    return (value) => {
-        if (typeof value !== 'undefined')
-            data.value = value;
-        
-        return data.value;
-    };
-};
+module.exports = require('../server/common/store');
 
diff --git a/server/cloudfunc.js b/server/cloudfunc.js
index b491a085..4f0e9e68 100644
--- a/server/cloudfunc.js
+++ b/server/cloudfunc.js
@@ -1,8 +1,8 @@
 'use strict';
 
 const rendy = require('rendy');
-const Entity = require('./entity');
-const store = require('../common/store');
+const Entity = require('./common/entity');
+const store = require('./common/store');
 
 /* КОНСТАНТЫ (общие для клиента и сервера)*/
 
diff --git a/server/entity.js b/server/common/entity.js
similarity index 100%
rename from server/entity.js
rename to server/common/entity.js
diff --git a/server/common/store.js b/server/common/store.js
new file mode 100644
index 00000000..7a94054f
--- /dev/null
+++ b/server/common/store.js
@@ -0,0 +1,13 @@
+'use strict';
+
+module.exports = () => {
+    const data = {};
+    
+    return (value) => {
+        if (typeof value !== 'undefined')
+            data.value = value;
+        
+        return data.value;
+    };
+};
+
diff --git a/test/server/entity.js b/test/common/entity.js
similarity index 90%
rename from test/server/entity.js
rename to test/common/entity.js
index b0fded8b..0c1d82ae 100644
--- a/test/server/entity.js
+++ b/test/common/entity.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const test = require('tape');
-const entity = require('../../server/entity');
+const entity = require('../../common/entity');
 
 test('cloudcmd: entity: encode', (t) => {
     const result = entity.encode('<hello> ');