Made some more refactorings, renamed Primary to Datatype and made it the superclass of only Str, Int and Bool. Also doesn't extend from QLExpression anymore.