Revise app structure and naming conventions - group models and views