Removed untested modules. These will be added once updated and tested.