Moved Server into main project instead of separate project

Created a new package for server. Deleted old project for server.