[nbittich]

isn't it breaking the one package one responsibility principle?uncle bob wouldn't be happy, it doesn't seem clean