switched to one file per model
moved to object layout