Reorganized folder structure.