started reformating base app structure