Modified folder structure