Merged serverside and clientside projects