remove class Module from header, cleanup
moved
update