Changes to server structure
Deleting unused files