Reorganize to allow for multiple schemas.