Some refactoring, integrated grunt for build and dev