Cleaned up, using grunt, js files in src