Streamlined and 'defaultified' schemas
Shuffling some files