Removes legacy code

Shuffles bits around to new modules that are still relevant