Reworking the folder structures.