Revised folder structure