As commented in the other ticket, it's just an approach until we get all the classes in their proper namespace