refactoring finished, now server and desktop are two seperate projects