Some reworking of the packages and the way they are started and stopped