Updated js directory structure to include src. Updated grunt uglify plugin to process all js files within dir, updated grunt watch on js files