Moved all server side, updatede with own files