Moved stuff, started on server API

Server API isn't working yet