start of grunt/npm refactoring