Refactor

Complete refactor of Dominus structure