Better naming of folder creation function.
Tidy up.