Improved folder structure