Added simple data model & improved organization