Some Initial Changes

Switch Gulp to Grunt, some file re-organization