moved stuff around
clean up
added server folder