started to clean up the structure of the server
started to clean up the structure of the server