Clean up formatting
Use new grunt-based file structure