Changed the class structure of some module API