restructured models, using directory scanner for aggregate-all