Module refactoring, move some code to more appropriate places.