generated entities and added some views for organization