Gruntfile changes and app structure update.