More 0.18 updates (modules)

Changed nodes, removed internals, added new module base