associations: renamed classess & added OneToOne relation