diff --git a/ChangeLog b/ChangeLog
index 9f97685f..adbfd31b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -138,6 +138,8 @@ config.json only if it setted up.
 * Fixed bug with traveling in directories with
 Javascript dissabled.
 
+* client.js and server.js moved to lib directory.
+
 
 2012.10.01, Version 0.1.7
 
diff --git a/cloudcmd.js b/cloudcmd.js
index 7c7707ad..a5a96dd6 100644
--- a/cloudcmd.js
+++ b/cloudcmd.js
@@ -13,7 +13,7 @@
         Util        = main.util,
         update      = main.update,
         
-        Server      = main.require(DIR + 'server'),
+        Server      = main.require(LIBDIR + 'server'),
         srv         = Server.CloudServer,
         Config      = main.config;
         
diff --git a/index.html b/index.html
index b0a2f6bb..e6e42b00 100644
--- a/index.html
+++ b/index.html
@@ -42,7 +42,7 @@
     </div>
     <script src=/lib/util.js></script>
     <script src=/lib/client/dom.js></script>
-    <script src=/client.js></script>
+    <script src=/lib/client.js></script>
     <!--[if lt IE 9]>
     <script src=/lib/client/ie.js id=ie_js ></script>
     <![endif]-->
diff --git a/client.js b/lib/client.js
similarity index 100%
rename from client.js
rename to lib/client.js
diff --git a/server.js b/lib/server.js
similarity index 100%
rename from server.js
rename to lib/server.js