fixed account models
restructuring project