Move server-code to /server and client-code to /client.
Update package.json after moving files.
Merge remote-tracking branch 'origin/master'