Added some ORM (OneToOne relations) and fixed package names.