fix name, further work to parameterise folders.
Adjust file comments