Move to full app structure