A few changes

Adding a few new modules and removing a few others