Schemas: Reorganized folder structure