Refactored to normal app structure