Restructured the PkgFile. Need to rewrite other stuff.