merged client and server into single project