Changed whole app structure.