Major refactoring of files in package: hide them in Package type.