Modularizing the package.
Moving some files around.