Consolidating schemas/models into single file...