Moved server to separate sub folder