moved server out to main dir