initial app structure, reorganized