Revised folder structure.