adding reworked ModuleInfo
adding reworked Module
working on rewrite