diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..b948985
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+*.swp
+*.pyc
diff --git a/client/index.html b/server/pages/index.html
similarity index 100%
rename from client/index.html
rename to server/pages/index.html
diff --git a/client/tempo.html b/server/pages/tempo.html
similarity index 79%
rename from client/tempo.html
rename to server/pages/tempo.html
index f3d73ab..0fe26a3 100644
--- a/client/tempo.html
+++ b/server/pages/tempo.html
@@ -5,19 +5,19 @@
 
 <title> TechREC </title>
 
-<link rel="stylesheet" type="text/css" href="css/style.css">
+<link rel="stylesheet" type="text/css" href="/static/css/style.css">
 
-<script src="js/jquery-1.9.1.min.js"></script>
-<script type="text/javascript" src="js/reclibrary.js"></script>
+<script src="/static/js/jquery-1.9.1.min.js"></script>
+<script type="text/javascript" src="/static/js/reclibrary.js"></script>
 
 <script>
-/* 
+/*
 TODO:
-prendere lo stato !!! 
+prendere lo stato !!!
 */
 $(document).ready(function(){
 
-    $("#searchform").submit( 
+    $("#searchform").submit(
         function (event) {
             event.preventDefault();
             dataString = $(this).serialize();
@@ -28,29 +28,29 @@ $(document).ready(function(){
 
                 $.each(data, function(key, val) {
                     console.log("Extract " + key );
-										
+
 					var divstring = "<div class=\"searchresult\" id=\""+ rs_trxarea(key) +"\"> </div>";
 
                     $("#searchresult").append( divstring );
                     // var str = newformstr( key ); // new form
 
 					var str = "";
-					str += "<div class=\"namevalues\">"+val.name+" - <a href=\"\">Scarica</a> <a href=\"\" id=\"delete-"+val.id+"\">Cancella</a></div>"; 
-					str += "<div class=\"namevalues\">RECID: "+val.recid+" ID: "+ val.id + " Active " + val.active + "</div>"; 
+					str += "<div class=\"namevalues\">"+val.name+" - <a href=\"\">Scarica</a> <a href=\"\" id=\"delete-"+val.id+"\">Cancella</a></div>";
+					str += "<div class=\"namevalues\">RECID: "+val.recid+" ID: "+ val.id + " Active " + val.active + "</div>";
 					str += "<div class=\"timevalues\">["+val.starttime+"  >>> "+val.endtime+"]</div>"
 
 					$("#"+rs_trxarea(key)).html(str);
                     $("#delete-"+val.id).click(function(evt) {
                             evt.preventDefault();
                             recDelete(val.recid, rs_trxarea(key) );
-                            
+
                         }
-                    ); // End of delete link handler 
-                    
+                    ); // End of delete link handler
+
                 });
             });
         });
-    $("#searchform").submit();   
+    $("#searchform").submit();
     });
 
 </script>
@@ -60,12 +60,12 @@ $(document).ready(function(){
 <body>
 
 <div id="pagecontainer">
-            
+
   <h1> techr*c </h1>
-        
+
   <h2> <a href="index.html"> Nuova registrazione</a> </h2>
-        
-  <div id="buttonscontainer"> 
+
+  <div id="buttonscontainer">
     <form action="#" method="POST" id="searchform">
         <input type="text" id="recid"       name="recid"        placeholder="Codice Registrazione" /> <br />
         <input type="text" id="name"        name="name"         placeholder="name"  />      <br />
@@ -75,11 +75,11 @@ $(document).ready(function(){
     </form>
   </div>
 
-  <div id="searchresult"> 
-  
-  </div> 
+  <div id="searchresult">
+
+  </div>
+
 
-   
 </div>
 
 <div id="footer">
diff --git a/server/requirements.txt b/server/requirements.txt
new file mode 100644
index 0000000..02e1dd2
--- /dev/null
+++ b/server/requirements.txt
@@ -0,0 +1,4 @@
+PyYAML==3.10
+SQLAlchemy==0.8.3
+bottle==0.11.6
+wsgiref==0.1.2
diff --git a/server/server.py b/server/server.py
index 7adb8ab..5430dd4 100644
--- a/server/server.py
+++ b/server/server.py
@@ -1,9 +1,10 @@
 # from bottle import hook, response, route, run, static_file, request
-from bottle import Bottle, hook, template, response, request,static_file
-import json
-import socket
+import datetime
+import logging
 
-from techrec import * 
+from bottle import Bottle, hook, response, request,static_file
+
+from techrec import Rec, RecDB
 
 class RecServer:
     def __init__(self,host="127.0.0.1", port=8000):
@@ -16,7 +17,7 @@ class RecServer:
         self.db = RecDB()
 
     def start(self):
-        self._app.run(host=self._host, port=self._port)
+        self._app.run(host=self._host, port=self._port, debug=True)
 
     @hook('after_request')
     def enable_cors(self):
@@ -31,20 +32,29 @@ class RecServer:
         self._app.route('/help', callback=self.help)
         self._app.route('/help/', callback=self.help)
 
-        self._app.route('/create', method="POST", callback=self.create)        
-        # self._app.post('/create', callback=self.create)        
-                
+        self._app.route('/create', method="POST", callback=self.create)
+        # self._app.post('/create', callback=self.create)
+
         self._app.route('/update', method="POST", callback=self.update)
-                
-        self._app.route('/search', method="POST", callback=self.search)        
-
+        self._app.route('/search', method="POST", callback=self.search)
         self._app.route('/delete', method="POST", callback=self.delete)
+        self._app.route('/static/<filepath:path>',
+                        callback= lambda filepath: static_file(filepath, root='static/'))
+        self._app.route('/js/<f>',
+                        callback= lambda f: static_file(f, root='static/js/'))
+        self._app.route('/css/<f>',
+                        callback= lambda f: static_file(f, root='static/css/'))
+        self._app.route('/img/<f>',
+                        callback= lambda f: static_file(f, root='static/img/'))
+        self._app.route('/', callback=lambda: static_file('index.html',
+            root='pages/'))
+        self._app.route('/tempo', callback=lambda: static_file('tempo.html',
+            root='pages/'))
 
-        
     def extsearch( self, args ):
         print "ARG", args
         return self.rec_err("EXT")
-        
+
     """
         CREATE HANDLER
     """
@@ -63,12 +73,12 @@ class RecServer:
         if req["endtime-"+req["recid"]] != "":
             endtime = datetime.datetime.strptime( req["endtime-"+req["recid"]] , "%Y/%m/%d %H:%M:%S")
 
-            
+
         print "Name %s RECID %s Starttime %s EndTime %s" %(req["name-"+req["recid"]],req["recid"], starttime,endtime )
-        ret = self.db.add( Rec(name=req["name-"+req["recid"]], 
-                        recid=req["recid"], 
+        ret = self.db.add( Rec(name=req["name-"+req["recid"]],
+                        recid=req["recid"],
                         starttime=starttime,
-                        endtime=endtime ) 
+                        endtime=endtime )
                     )
 
         return { "msg": "Nuova registrazione aggiunta", }
@@ -77,7 +87,7 @@ class RecServer:
     # @route('/active')
     def getactive(self):
         print "GetActive"
-            
+
     """
         DELETE HANDLER
     """
@@ -88,7 +98,7 @@ class RecServer:
         logging.info("Server: request delete %s " % ( req ) )
         if not req.has_key( "recid" ):
             return self.rec_err("No valid ID")
-        
+
         if self.db.delete( req["recid"] ):
             return self.rec_msg("DELETE OK")
         else:
@@ -106,12 +116,12 @@ class RecServer:
         ret["starttime"]    = req ["starttime-"+req["recid"]]
         ret["endtime"]      = req["endtime-"+req["recid"]]
         ret["name"]         = req["name-"+req["recid"]]
-        
+
         if self.db.update( req["recid"], ret ):
             return self.rec_msg("Aggiornamento completato!");
         else:
             return self.rec_err("Errore Aggiornamento");
-        
+
     """
         JSON' RESPONDER
     """
@@ -128,27 +138,27 @@ class RecServer:
 
         req  = dict( request.POST.allitems() )
         print "Search request: %s" % (req)
-        
+
         name = "%s" % req["name"]
         if req["name"] == "": name = None
-       
+
         starttime = req["starttime"]
         if req["starttime"] == "": starttime = None
-        
+
         endtime = req["endtime"]
         if req["endtime"] == "": endtime = None
-        
-        recid = req["recid"] 
+
+        recid = req["recid"]
         if req["recid"]== "": recid = None
-        
+
         active = True
-        
+
         values =  self.db._search(recid=recid,name=name, starttime=starttime, endtime=endtime,active=active)
         print "Returned Values %s" % values
         ret = {}
         for rec in values:
-            recid = "rec-" + str(rec.id) 
-            
+            recid = "rec-" + str(rec.id)
+
             ret [recid] = {}
             ret [recid]["name"] = rec.name
             ret [recid]["id"] = rec.id
@@ -156,15 +166,15 @@ class RecServer:
             ret [recid]["starttime"] = rec.starttime.strftime("%Y-%m-%d-%H-%H-%s")
             if rec.endtime != None:
                 ret [recid]["endtime"] = rec.endtime.strftime("%Y-%m-%d-%H-%H-%s")
-                
+
             ret [recid]["active"] =  rec.active
 
         logging.info("Return: %s" % ret);
         return ret
-                
+
     # @route('/favicon.ico')
     def favicon(self):
-        return static_file('icon.ico', root="./img/", mimetype="image/ico")
+        return static_file('icon.ico', root="/static/img/", mimetype="image/ico")
 
     # @route('/help')
     def help(self):
@@ -184,5 +194,5 @@ class RecServer:
     TESTs
 """
 if __name__ == "__main__":
-    c = RecServer(host="0.0.0.0")
+    c = RecServer(host="localhost")
     c.start()
diff --git a/client/css/style.css b/server/static/css/style.css
similarity index 100%
rename from client/css/style.css
rename to server/static/css/style.css
diff --git a/client/img/7915.orig.png b/server/static/img/7915.orig.png
similarity index 100%
rename from client/img/7915.orig.png
rename to server/static/img/7915.orig.png
diff --git a/client/img/7915.png b/server/static/img/7915.png
similarity index 100%
rename from client/img/7915.png
rename to server/static/img/7915.png
diff --git a/client/img/ajax-loader.gif b/server/static/img/ajax-loader.gif
similarity index 100%
rename from client/img/ajax-loader.gif
rename to server/static/img/ajax-loader.gif
diff --git a/client/img/button.jpg b/server/static/img/button.jpg
similarity index 100%
rename from client/img/button.jpg
rename to server/static/img/button.jpg
diff --git a/client/img/icon.ico b/server/static/img/icon.ico
similarity index 100%
rename from client/img/icon.ico
rename to server/static/img/icon.ico
diff --git a/client/js/jquery-1.9.1.min.js b/server/static/js/jquery-1.9.1.min.js
similarity index 100%
rename from client/js/jquery-1.9.1.min.js
rename to server/static/js/jquery-1.9.1.min.js
diff --git a/client/js/reclibrary.js b/server/static/js/reclibrary.js
similarity index 100%
rename from client/js/reclibrary.js
rename to server/static/js/reclibrary.js
diff --git a/client/techrec/jquery-1.9.1.min.js b/server/static/techrec/jquery-1.9.1.min.js
similarity index 100%
rename from client/techrec/jquery-1.9.1.min.js
rename to server/static/techrec/jquery-1.9.1.min.js
diff --git a/client/techrec/mp3wrapper.sh b/server/static/techrec/mp3wrapper.sh
similarity index 100%
rename from client/techrec/mp3wrapper.sh
rename to server/static/techrec/mp3wrapper.sh
diff --git a/client/techrec/note b/server/static/techrec/note
similarity index 100%
rename from client/techrec/note
rename to server/static/techrec/note
diff --git a/client/techrec/style.css b/server/static/techrec/style.css
similarity index 100%
rename from client/techrec/style.css
rename to server/static/techrec/style.css
