Added getOutputDirectory to Output and cleaned up