Relocate Module classfile to top-level directory
Merge branch 'hotfix/module-relocation'
Fix unit tests

- Expectations changed with 8a22b9e - updated tests to correspond.
Merge branch 'hotfix/tests'

Fixed unit tests
CS fixes

- trailing whitespace