[DoBr] Split to modules