module structure
rebuild app structure
refactoring