Simplifying the folder structure