Fixed classes to just be modules and stuff. Some import fixing.