Before changing app structure