Major refactoring for ORM code:

 - Moved ORM to own package
 - Changed logic; Model type is now a wrapper for user-mapped fields
 - Wrote more tests