Fix module nesting

This commit cannot be combined with the one where I rename the class, because the line diff gets too large and `git` will stop tracking it as a file rename (it'll think it's a file deletion and an unrelated new file creation)

Author: amomchilov