Reorganized client/server folders for heroku compliance.