Refactoring 4.12 module, fixed main class error