Moves server.js
Merge branch 'package'