cleanup and move some modules out