restructured js files, using grunt to combine and uglify