Rearranged the project structure and added the server project