Code reorganized into a package