reorganized shelter schema