Rearranging modules and packages.