Refactoring: indy renaming, filenames
Refactoring: indy renaming, contents
Bugfix: missing space
Bump to 0.40.0