Changed the structure of the packages for internal refactorisation to be done