Dev merged into master

Wanted to get the new filenames in my local repository. I'll look for orphaned files too (topics.py can do that).