moved Conditions classes to it's own package