Improved folder organization.