Revert: Various things (6e400fd)

Added domain models
Moved packages