refactor app structure
refactor app structure