Do module clean up
Fix RequiredCmd
Fix typo
Move module to new location