more refactoring
rename tests
More Renaming
before refactoring
Refactoring the server