Align folder with renaming conventions