further structural changes, dropped separation of "custom" and "common" models for now