Moved around code and namespaces in order to separate expression parser related code.