Moved inner static classes to a external library. refs #500