Moved server to top level directory