Further simplify the folder structure.