Moved Server files from Separate project

Moved Server files from separate project to the main project.