refactor / re-org many server files