Refactor folder creation into two for-loops
Add missing quote to support's init file
Pep8 cleanup of comments