moved server into separate directory