Move server code into subdirectory