Moved js out of public and refactored grunt to concat and move"