Update grunt paths.
Update project files structure.
Fix Indentation.