Simplified file structure and reduced grunt tasks for faster compilation