create Usage and Computer domain objects + repository
merge
fix references after merge