Improved folder naming scheme.