Clean up source code
Merge branch 'cleanUp' into develop
Make require statements inside server.js more consistent
Fix log function inside server
Merge branch 'cleanUp' into develop