Moved some configuration classes around.