Reorganized project into client and server