Module refactoring and MethodModule extensions