Slight reorganization of packages