Improved folder structure.