Moved server into its own directory