Cleaned Parser
Moved Constraint to internal.containers
Fully implemented Constraint class
Added UnionType enum to specify (AND | OR) and updated references