Lots of new modules and removed a few others