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