Move stuff to server

much secure