Refactoring code into system module
and some general cleanup
Updating grunt and package.json