JS restructuring and grunt min and combine