Code clean up. Module refactoring. MXDump as separate module.