moved server into own folder