reorganized the schema