Introducing geo primitives
= renaming more stuff from model to geo
+ added geo primitive type