Moved ConditionBlock composite class to condition subpackage
Moved Question composite class to question subpackage