Moved ConditionBlock class to subpackage statements