Refactored outputs. Modes can no longer be just a module not including a class with the same name.