Transform some packages to modules again