Introducing sub packages could also do the trick and would structure our classes which could be good.