Some app structure changes