Refactor en package