Packaged up the mess. Moved modules to proper places.