Conforming folder names to established pattern, and adding my own