orm: Map relationships to business logic class instead of models
Fix layout related issues