refactor some stuff
renamed server files