TISTUD-4785 Moving the internal class