restructured the models for accounts