[1] Refactoring of the packages and the source to match