Updated multiple items in ORM namespace

Started working on mapping portion of ORM. Still need to create an
actual query generator namespace.