Simplify content folder structure.