Fixing server project, furthur refactors