fixed app structure and fixed grunt tasks