diff --git a/src/add-ons/kernel/file_systems/packagefs/Jamfile b/src/add-ons/kernel/file_systems/packagefs/Jamfile index f3a4544bcd..203e8507d7 100644 --- a/src/add-ons/kernel/file_systems/packagefs/Jamfile +++ b/src/add-ons/kernel/file_systems/packagefs/Jamfile @@ -6,6 +6,18 @@ UsePrivateKernelHeaders ; UsePrivateHeaders package shared storage ; +local subDirs = + indices + nodes + package + package_links + resolvables + util + volume +; +SEARCH_SOURCE += $(subDirs:D=$(SUBDIR)) ; + + HAIKU_PACKAGE_FS_SOURCES = AttributeCookie.cpp AttributeDirectoryCookie.cpp diff --git a/src/add-ons/kernel/file_systems/packagefs/AttributeIndex.cpp b/src/add-ons/kernel/file_systems/packagefs/indices/AttributeIndex.cpp similarity index 100% rename from src/add-ons/kernel/file_systems/packagefs/AttributeIndex.cpp rename to src/add-ons/kernel/file_systems/packagefs/indices/AttributeIndex.cpp diff --git a/src/add-ons/kernel/file_systems/packagefs/AttributeIndex.h b/src/add-ons/kernel/file_systems/packagefs/indices/AttributeIndex.h similarity index 100% rename from src/add-ons/kernel/file_systems/packagefs/AttributeIndex.h rename to src/add-ons/kernel/file_systems/packagefs/indices/AttributeIndex.h diff --git a/src/add-ons/kernel/file_systems/packagefs/AttributeIndexer.h b/src/add-ons/kernel/file_systems/packagefs/indices/AttributeIndexer.h similarity index 100% rename from src/add-ons/kernel/file_systems/packagefs/AttributeIndexer.h rename to src/add-ons/kernel/file_systems/packagefs/indices/AttributeIndexer.h diff --git a/src/add-ons/kernel/file_systems/packagefs/Index.cpp b/src/add-ons/kernel/file_systems/packagefs/indices/Index.cpp similarity index 100% rename from src/add-ons/kernel/file_systems/packagefs/Index.cpp rename to src/add-ons/kernel/file_systems/packagefs/indices/Index.cpp diff --git a/src/add-ons/kernel/file_systems/packagefs/Index.h b/src/add-ons/kernel/file_systems/packagefs/indices/Index.h similarity index 100% rename from src/add-ons/kernel/file_systems/packagefs/Index.h rename to src/add-ons/kernel/file_systems/packagefs/indices/Index.h diff --git a/src/add-ons/kernel/file_systems/packagefs/IndexImpl.h b/src/add-ons/kernel/file_systems/packagefs/indices/IndexImpl.h similarity index 100% rename from src/add-ons/kernel/file_systems/packagefs/IndexImpl.h rename to src/add-ons/kernel/file_systems/packagefs/indices/IndexImpl.h diff --git a/src/add-ons/kernel/file_systems/packagefs/IndexedAttributeOwner.cpp b/src/add-ons/kernel/file_systems/packagefs/indices/IndexedAttributeOwner.cpp similarity index 100% rename from src/add-ons/kernel/file_systems/packagefs/IndexedAttributeOwner.cpp rename to src/add-ons/kernel/file_systems/packagefs/indices/IndexedAttributeOwner.cpp diff --git a/src/add-ons/kernel/file_systems/packagefs/IndexedAttributeOwner.h b/src/add-ons/kernel/file_systems/packagefs/indices/IndexedAttributeOwner.h similarity index 100% rename from src/add-ons/kernel/file_systems/packagefs/IndexedAttributeOwner.h rename to src/add-ons/kernel/file_systems/packagefs/indices/IndexedAttributeOwner.h diff --git a/src/add-ons/kernel/file_systems/packagefs/LastModifiedIndex.cpp b/src/add-ons/kernel/file_systems/packagefs/indices/LastModifiedIndex.cpp similarity index 100% rename from src/add-ons/kernel/file_systems/packagefs/LastModifiedIndex.cpp rename to src/add-ons/kernel/file_systems/packagefs/indices/LastModifiedIndex.cpp diff --git a/src/add-ons/kernel/file_systems/packagefs/LastModifiedIndex.h b/src/add-ons/kernel/file_systems/packagefs/indices/LastModifiedIndex.h similarity index 100% rename from src/add-ons/kernel/file_systems/packagefs/LastModifiedIndex.h rename to src/add-ons/kernel/file_systems/packagefs/indices/LastModifiedIndex.h diff --git a/src/add-ons/kernel/file_systems/packagefs/NameIndex.cpp b/src/add-ons/kernel/file_systems/packagefs/indices/NameIndex.cpp similarity index 100% rename from src/add-ons/kernel/file_systems/packagefs/NameIndex.cpp rename to src/add-ons/kernel/file_systems/packagefs/indices/NameIndex.cpp diff --git a/src/add-ons/kernel/file_systems/packagefs/NameIndex.h b/src/add-ons/kernel/file_systems/packagefs/indices/NameIndex.h similarity index 100% rename from src/add-ons/kernel/file_systems/packagefs/NameIndex.h rename to src/add-ons/kernel/file_systems/packagefs/indices/NameIndex.h diff --git a/src/add-ons/kernel/file_systems/packagefs/Query.cpp b/src/add-ons/kernel/file_systems/packagefs/indices/Query.cpp similarity index 100% rename from src/add-ons/kernel/file_systems/packagefs/Query.cpp rename to src/add-ons/kernel/file_systems/packagefs/indices/Query.cpp diff --git a/src/add-ons/kernel/file_systems/packagefs/Query.h b/src/add-ons/kernel/file_systems/packagefs/indices/Query.h similarity index 100% rename from src/add-ons/kernel/file_systems/packagefs/Query.h rename to src/add-ons/kernel/file_systems/packagefs/indices/Query.h diff --git a/src/add-ons/kernel/file_systems/packagefs/SizeIndex.cpp b/src/add-ons/kernel/file_systems/packagefs/indices/SizeIndex.cpp similarity index 100% rename from src/add-ons/kernel/file_systems/packagefs/SizeIndex.cpp rename to src/add-ons/kernel/file_systems/packagefs/indices/SizeIndex.cpp diff --git a/src/add-ons/kernel/file_systems/packagefs/SizeIndex.h b/src/add-ons/kernel/file_systems/packagefs/indices/SizeIndex.h similarity index 100% rename from src/add-ons/kernel/file_systems/packagefs/SizeIndex.h rename to src/add-ons/kernel/file_systems/packagefs/indices/SizeIndex.h diff --git a/src/add-ons/kernel/file_systems/packagefs/AttributeCookie.cpp b/src/add-ons/kernel/file_systems/packagefs/nodes/AttributeCookie.cpp similarity index 100% rename from src/add-ons/kernel/file_systems/packagefs/AttributeCookie.cpp rename to src/add-ons/kernel/file_systems/packagefs/nodes/AttributeCookie.cpp diff --git a/src/add-ons/kernel/file_systems/packagefs/AttributeCookie.h b/src/add-ons/kernel/file_systems/packagefs/nodes/AttributeCookie.h similarity index 100% rename from src/add-ons/kernel/file_systems/packagefs/AttributeCookie.h rename to src/add-ons/kernel/file_systems/packagefs/nodes/AttributeCookie.h diff --git a/src/add-ons/kernel/file_systems/packagefs/AttributeDirectoryCookie.cpp b/src/add-ons/kernel/file_systems/packagefs/nodes/AttributeDirectoryCookie.cpp similarity index 100% rename from src/add-ons/kernel/file_systems/packagefs/AttributeDirectoryCookie.cpp rename to src/add-ons/kernel/file_systems/packagefs/nodes/AttributeDirectoryCookie.cpp diff --git a/src/add-ons/kernel/file_systems/packagefs/AttributeDirectoryCookie.h b/src/add-ons/kernel/file_systems/packagefs/nodes/AttributeDirectoryCookie.h similarity index 100% rename from src/add-ons/kernel/file_systems/packagefs/AttributeDirectoryCookie.h rename to src/add-ons/kernel/file_systems/packagefs/nodes/AttributeDirectoryCookie.h diff --git a/src/add-ons/kernel/file_systems/packagefs/AutoPackageAttributes.cpp b/src/add-ons/kernel/file_systems/packagefs/nodes/AutoPackageAttributes.cpp similarity index 100% rename from src/add-ons/kernel/file_systems/packagefs/AutoPackageAttributes.cpp rename to src/add-ons/kernel/file_systems/packagefs/nodes/AutoPackageAttributes.cpp diff --git a/src/add-ons/kernel/file_systems/packagefs/AutoPackageAttributes.h b/src/add-ons/kernel/file_systems/packagefs/nodes/AutoPackageAttributes.h similarity index 100% rename from src/add-ons/kernel/file_systems/packagefs/AutoPackageAttributes.h rename to src/add-ons/kernel/file_systems/packagefs/nodes/AutoPackageAttributes.h diff --git a/src/add-ons/kernel/file_systems/packagefs/Directory.cpp b/src/add-ons/kernel/file_systems/packagefs/nodes/Directory.cpp similarity index 100% rename from src/add-ons/kernel/file_systems/packagefs/Directory.cpp rename to src/add-ons/kernel/file_systems/packagefs/nodes/Directory.cpp diff --git a/src/add-ons/kernel/file_systems/packagefs/Directory.h b/src/add-ons/kernel/file_systems/packagefs/nodes/Directory.h similarity index 100% rename from src/add-ons/kernel/file_systems/packagefs/Directory.h rename to src/add-ons/kernel/file_systems/packagefs/nodes/Directory.h diff --git a/src/add-ons/kernel/file_systems/packagefs/EmptyAttributeDirectoryCookie.cpp b/src/add-ons/kernel/file_systems/packagefs/nodes/EmptyAttributeDirectoryCookie.cpp similarity index 100% rename from src/add-ons/kernel/file_systems/packagefs/EmptyAttributeDirectoryCookie.cpp rename to src/add-ons/kernel/file_systems/packagefs/nodes/EmptyAttributeDirectoryCookie.cpp diff --git a/src/add-ons/kernel/file_systems/packagefs/EmptyAttributeDirectoryCookie.h b/src/add-ons/kernel/file_systems/packagefs/nodes/EmptyAttributeDirectoryCookie.h similarity index 100% rename from src/add-ons/kernel/file_systems/packagefs/EmptyAttributeDirectoryCookie.h rename to src/add-ons/kernel/file_systems/packagefs/nodes/EmptyAttributeDirectoryCookie.h diff --git a/src/add-ons/kernel/file_systems/packagefs/Node.cpp b/src/add-ons/kernel/file_systems/packagefs/nodes/Node.cpp similarity index 100% rename from src/add-ons/kernel/file_systems/packagefs/Node.cpp rename to src/add-ons/kernel/file_systems/packagefs/nodes/Node.cpp diff --git a/src/add-ons/kernel/file_systems/packagefs/Node.h b/src/add-ons/kernel/file_systems/packagefs/nodes/Node.h similarity index 100% rename from src/add-ons/kernel/file_systems/packagefs/Node.h rename to src/add-ons/kernel/file_systems/packagefs/nodes/Node.h diff --git a/src/add-ons/kernel/file_systems/packagefs/OldUnpackingNodeAttributes.cpp b/src/add-ons/kernel/file_systems/packagefs/nodes/OldUnpackingNodeAttributes.cpp similarity index 100% rename from src/add-ons/kernel/file_systems/packagefs/OldUnpackingNodeAttributes.cpp rename to src/add-ons/kernel/file_systems/packagefs/nodes/OldUnpackingNodeAttributes.cpp diff --git a/src/add-ons/kernel/file_systems/packagefs/OldUnpackingNodeAttributes.h b/src/add-ons/kernel/file_systems/packagefs/nodes/OldUnpackingNodeAttributes.h similarity index 100% rename from src/add-ons/kernel/file_systems/packagefs/OldUnpackingNodeAttributes.h rename to src/add-ons/kernel/file_systems/packagefs/nodes/OldUnpackingNodeAttributes.h diff --git a/src/add-ons/kernel/file_systems/packagefs/UnpackingAttributeCookie.cpp b/src/add-ons/kernel/file_systems/packagefs/nodes/UnpackingAttributeCookie.cpp similarity index 100% rename from src/add-ons/kernel/file_systems/packagefs/UnpackingAttributeCookie.cpp rename to src/add-ons/kernel/file_systems/packagefs/nodes/UnpackingAttributeCookie.cpp diff --git a/src/add-ons/kernel/file_systems/packagefs/UnpackingAttributeCookie.h b/src/add-ons/kernel/file_systems/packagefs/nodes/UnpackingAttributeCookie.h similarity index 100% rename from src/add-ons/kernel/file_systems/packagefs/UnpackingAttributeCookie.h rename to src/add-ons/kernel/file_systems/packagefs/nodes/UnpackingAttributeCookie.h diff --git a/src/add-ons/kernel/file_systems/packagefs/UnpackingAttributeDirectoryCookie.cpp b/src/add-ons/kernel/file_systems/packagefs/nodes/UnpackingAttributeDirectoryCookie.cpp similarity index 100% rename from src/add-ons/kernel/file_systems/packagefs/UnpackingAttributeDirectoryCookie.cpp rename to src/add-ons/kernel/file_systems/packagefs/nodes/UnpackingAttributeDirectoryCookie.cpp diff --git a/src/add-ons/kernel/file_systems/packagefs/UnpackingAttributeDirectoryCookie.h b/src/add-ons/kernel/file_systems/packagefs/nodes/UnpackingAttributeDirectoryCookie.h similarity index 100% rename from src/add-ons/kernel/file_systems/packagefs/UnpackingAttributeDirectoryCookie.h rename to src/add-ons/kernel/file_systems/packagefs/nodes/UnpackingAttributeDirectoryCookie.h diff --git a/src/add-ons/kernel/file_systems/packagefs/UnpackingDirectory.cpp b/src/add-ons/kernel/file_systems/packagefs/nodes/UnpackingDirectory.cpp similarity index 100% rename from src/add-ons/kernel/file_systems/packagefs/UnpackingDirectory.cpp rename to src/add-ons/kernel/file_systems/packagefs/nodes/UnpackingDirectory.cpp diff --git a/src/add-ons/kernel/file_systems/packagefs/UnpackingDirectory.h b/src/add-ons/kernel/file_systems/packagefs/nodes/UnpackingDirectory.h similarity index 100% rename from src/add-ons/kernel/file_systems/packagefs/UnpackingDirectory.h rename to src/add-ons/kernel/file_systems/packagefs/nodes/UnpackingDirectory.h diff --git a/src/add-ons/kernel/file_systems/packagefs/UnpackingLeafNode.cpp b/src/add-ons/kernel/file_systems/packagefs/nodes/UnpackingLeafNode.cpp similarity index 100% rename from src/add-ons/kernel/file_systems/packagefs/UnpackingLeafNode.cpp rename to src/add-ons/kernel/file_systems/packagefs/nodes/UnpackingLeafNode.cpp diff --git a/src/add-ons/kernel/file_systems/packagefs/UnpackingLeafNode.h b/src/add-ons/kernel/file_systems/packagefs/nodes/UnpackingLeafNode.h similarity index 100% rename from src/add-ons/kernel/file_systems/packagefs/UnpackingLeafNode.h rename to src/add-ons/kernel/file_systems/packagefs/nodes/UnpackingLeafNode.h diff --git a/src/add-ons/kernel/file_systems/packagefs/UnpackingNode.cpp b/src/add-ons/kernel/file_systems/packagefs/nodes/UnpackingNode.cpp similarity index 100% rename from src/add-ons/kernel/file_systems/packagefs/UnpackingNode.cpp rename to src/add-ons/kernel/file_systems/packagefs/nodes/UnpackingNode.cpp diff --git a/src/add-ons/kernel/file_systems/packagefs/UnpackingNode.h b/src/add-ons/kernel/file_systems/packagefs/nodes/UnpackingNode.h similarity index 100% rename from src/add-ons/kernel/file_systems/packagefs/UnpackingNode.h rename to src/add-ons/kernel/file_systems/packagefs/nodes/UnpackingNode.h diff --git a/src/add-ons/kernel/file_systems/packagefs/BlockBufferCacheKernel.cpp b/src/add-ons/kernel/file_systems/packagefs/package/BlockBufferCacheKernel.cpp similarity index 100% rename from src/add-ons/kernel/file_systems/packagefs/BlockBufferCacheKernel.cpp rename to src/add-ons/kernel/file_systems/packagefs/package/BlockBufferCacheKernel.cpp diff --git a/src/add-ons/kernel/file_systems/packagefs/BlockBufferCacheKernel.h b/src/add-ons/kernel/file_systems/packagefs/package/BlockBufferCacheKernel.h similarity index 100% rename from src/add-ons/kernel/file_systems/packagefs/BlockBufferCacheKernel.h rename to src/add-ons/kernel/file_systems/packagefs/package/BlockBufferCacheKernel.h diff --git a/src/add-ons/kernel/file_systems/packagefs/GlobalFactory.cpp b/src/add-ons/kernel/file_systems/packagefs/package/GlobalFactory.cpp similarity index 100% rename from src/add-ons/kernel/file_systems/packagefs/GlobalFactory.cpp rename to src/add-ons/kernel/file_systems/packagefs/package/GlobalFactory.cpp diff --git a/src/add-ons/kernel/file_systems/packagefs/GlobalFactory.h b/src/add-ons/kernel/file_systems/packagefs/package/GlobalFactory.h similarity index 100% rename from src/add-ons/kernel/file_systems/packagefs/GlobalFactory.h rename to src/add-ons/kernel/file_systems/packagefs/package/GlobalFactory.h diff --git a/src/add-ons/kernel/file_systems/packagefs/Package.cpp b/src/add-ons/kernel/file_systems/packagefs/package/Package.cpp similarity index 100% rename from src/add-ons/kernel/file_systems/packagefs/Package.cpp rename to src/add-ons/kernel/file_systems/packagefs/package/Package.cpp diff --git a/src/add-ons/kernel/file_systems/packagefs/Package.h b/src/add-ons/kernel/file_systems/packagefs/package/Package.h similarity index 100% rename from src/add-ons/kernel/file_systems/packagefs/Package.h rename to src/add-ons/kernel/file_systems/packagefs/package/Package.h diff --git a/src/add-ons/kernel/file_systems/packagefs/PackageDirectory.cpp b/src/add-ons/kernel/file_systems/packagefs/package/PackageDirectory.cpp similarity index 100% rename from src/add-ons/kernel/file_systems/packagefs/PackageDirectory.cpp rename to src/add-ons/kernel/file_systems/packagefs/package/PackageDirectory.cpp diff --git a/src/add-ons/kernel/file_systems/packagefs/PackageDirectory.h b/src/add-ons/kernel/file_systems/packagefs/package/PackageDirectory.h similarity index 100% rename from src/add-ons/kernel/file_systems/packagefs/PackageDirectory.h rename to src/add-ons/kernel/file_systems/packagefs/package/PackageDirectory.h diff --git a/src/add-ons/kernel/file_systems/packagefs/PackageFile.cpp b/src/add-ons/kernel/file_systems/packagefs/package/PackageFile.cpp similarity index 100% rename from src/add-ons/kernel/file_systems/packagefs/PackageFile.cpp rename to src/add-ons/kernel/file_systems/packagefs/package/PackageFile.cpp diff --git a/src/add-ons/kernel/file_systems/packagefs/PackageFile.h b/src/add-ons/kernel/file_systems/packagefs/package/PackageFile.h similarity index 100% rename from src/add-ons/kernel/file_systems/packagefs/PackageFile.h rename to src/add-ons/kernel/file_systems/packagefs/package/PackageFile.h diff --git a/src/add-ons/kernel/file_systems/packagefs/PackageLeafNode.cpp b/src/add-ons/kernel/file_systems/packagefs/package/PackageLeafNode.cpp similarity index 100% rename from src/add-ons/kernel/file_systems/packagefs/PackageLeafNode.cpp rename to src/add-ons/kernel/file_systems/packagefs/package/PackageLeafNode.cpp diff --git a/src/add-ons/kernel/file_systems/packagefs/PackageLeafNode.h b/src/add-ons/kernel/file_systems/packagefs/package/PackageLeafNode.h similarity index 100% rename from src/add-ons/kernel/file_systems/packagefs/PackageLeafNode.h rename to src/add-ons/kernel/file_systems/packagefs/package/PackageLeafNode.h diff --git a/src/add-ons/kernel/file_systems/packagefs/PackageNode.cpp b/src/add-ons/kernel/file_systems/packagefs/package/PackageNode.cpp similarity index 100% rename from src/add-ons/kernel/file_systems/packagefs/PackageNode.cpp rename to src/add-ons/kernel/file_systems/packagefs/package/PackageNode.cpp diff --git a/src/add-ons/kernel/file_systems/packagefs/PackageNode.h b/src/add-ons/kernel/file_systems/packagefs/package/PackageNode.h similarity index 100% rename from src/add-ons/kernel/file_systems/packagefs/PackageNode.h rename to src/add-ons/kernel/file_systems/packagefs/package/PackageNode.h diff --git a/src/add-ons/kernel/file_systems/packagefs/PackageNodeAttribute.cpp b/src/add-ons/kernel/file_systems/packagefs/package/PackageNodeAttribute.cpp similarity index 100% rename from src/add-ons/kernel/file_systems/packagefs/PackageNodeAttribute.cpp rename to src/add-ons/kernel/file_systems/packagefs/package/PackageNodeAttribute.cpp diff --git a/src/add-ons/kernel/file_systems/packagefs/PackageNodeAttribute.h b/src/add-ons/kernel/file_systems/packagefs/package/PackageNodeAttribute.h similarity index 100% rename from src/add-ons/kernel/file_systems/packagefs/PackageNodeAttribute.h rename to src/add-ons/kernel/file_systems/packagefs/package/PackageNodeAttribute.h diff --git a/src/add-ons/kernel/file_systems/packagefs/PackageSymlink.cpp b/src/add-ons/kernel/file_systems/packagefs/package/PackageSymlink.cpp similarity index 100% rename from src/add-ons/kernel/file_systems/packagefs/PackageSymlink.cpp rename to src/add-ons/kernel/file_systems/packagefs/package/PackageSymlink.cpp diff --git a/src/add-ons/kernel/file_systems/packagefs/PackageSymlink.h b/src/add-ons/kernel/file_systems/packagefs/package/PackageSymlink.h similarity index 100% rename from src/add-ons/kernel/file_systems/packagefs/PackageSymlink.h rename to src/add-ons/kernel/file_systems/packagefs/package/PackageSymlink.h diff --git a/src/add-ons/kernel/file_systems/packagefs/PackageLinkDirectory.cpp b/src/add-ons/kernel/file_systems/packagefs/package_links/PackageLinkDirectory.cpp similarity index 100% rename from src/add-ons/kernel/file_systems/packagefs/PackageLinkDirectory.cpp rename to src/add-ons/kernel/file_systems/packagefs/package_links/PackageLinkDirectory.cpp diff --git a/src/add-ons/kernel/file_systems/packagefs/PackageLinkDirectory.h b/src/add-ons/kernel/file_systems/packagefs/package_links/PackageLinkDirectory.h similarity index 100% rename from src/add-ons/kernel/file_systems/packagefs/PackageLinkDirectory.h rename to src/add-ons/kernel/file_systems/packagefs/package_links/PackageLinkDirectory.h diff --git a/src/add-ons/kernel/file_systems/packagefs/PackageLinkSymlink.cpp b/src/add-ons/kernel/file_systems/packagefs/package_links/PackageLinkSymlink.cpp similarity index 100% rename from src/add-ons/kernel/file_systems/packagefs/PackageLinkSymlink.cpp rename to src/add-ons/kernel/file_systems/packagefs/package_links/PackageLinkSymlink.cpp diff --git a/src/add-ons/kernel/file_systems/packagefs/PackageLinkSymlink.h b/src/add-ons/kernel/file_systems/packagefs/package_links/PackageLinkSymlink.h similarity index 100% rename from src/add-ons/kernel/file_systems/packagefs/PackageLinkSymlink.h rename to src/add-ons/kernel/file_systems/packagefs/package_links/PackageLinkSymlink.h diff --git a/src/add-ons/kernel/file_systems/packagefs/PackageLinksDirectory.cpp b/src/add-ons/kernel/file_systems/packagefs/package_links/PackageLinksDirectory.cpp similarity index 100% rename from src/add-ons/kernel/file_systems/packagefs/PackageLinksDirectory.cpp rename to src/add-ons/kernel/file_systems/packagefs/package_links/PackageLinksDirectory.cpp diff --git a/src/add-ons/kernel/file_systems/packagefs/PackageLinksDirectory.h b/src/add-ons/kernel/file_systems/packagefs/package_links/PackageLinksDirectory.h similarity index 100% rename from src/add-ons/kernel/file_systems/packagefs/PackageLinksDirectory.h rename to src/add-ons/kernel/file_systems/packagefs/package_links/PackageLinksDirectory.h diff --git a/src/add-ons/kernel/file_systems/packagefs/PackageLinksListener.cpp b/src/add-ons/kernel/file_systems/packagefs/package_links/PackageLinksListener.cpp similarity index 100% rename from src/add-ons/kernel/file_systems/packagefs/PackageLinksListener.cpp rename to src/add-ons/kernel/file_systems/packagefs/package_links/PackageLinksListener.cpp diff --git a/src/add-ons/kernel/file_systems/packagefs/PackageLinksListener.h b/src/add-ons/kernel/file_systems/packagefs/package_links/PackageLinksListener.h similarity index 100% rename from src/add-ons/kernel/file_systems/packagefs/PackageLinksListener.h rename to src/add-ons/kernel/file_systems/packagefs/package_links/PackageLinksListener.h diff --git a/src/add-ons/kernel/file_systems/packagefs/Dependency.cpp b/src/add-ons/kernel/file_systems/packagefs/resolvables/Dependency.cpp similarity index 100% rename from src/add-ons/kernel/file_systems/packagefs/Dependency.cpp rename to src/add-ons/kernel/file_systems/packagefs/resolvables/Dependency.cpp diff --git a/src/add-ons/kernel/file_systems/packagefs/Dependency.h b/src/add-ons/kernel/file_systems/packagefs/resolvables/Dependency.h similarity index 100% rename from src/add-ons/kernel/file_systems/packagefs/Dependency.h rename to src/add-ons/kernel/file_systems/packagefs/resolvables/Dependency.h diff --git a/src/add-ons/kernel/file_systems/packagefs/DependencyFamily.h b/src/add-ons/kernel/file_systems/packagefs/resolvables/DependencyFamily.h similarity index 100% rename from src/add-ons/kernel/file_systems/packagefs/DependencyFamily.h rename to src/add-ons/kernel/file_systems/packagefs/resolvables/DependencyFamily.h diff --git a/src/add-ons/kernel/file_systems/packagefs/Resolvable.cpp b/src/add-ons/kernel/file_systems/packagefs/resolvables/Resolvable.cpp similarity index 100% rename from src/add-ons/kernel/file_systems/packagefs/Resolvable.cpp rename to src/add-ons/kernel/file_systems/packagefs/resolvables/Resolvable.cpp diff --git a/src/add-ons/kernel/file_systems/packagefs/Resolvable.h b/src/add-ons/kernel/file_systems/packagefs/resolvables/Resolvable.h similarity index 100% rename from src/add-ons/kernel/file_systems/packagefs/Resolvable.h rename to src/add-ons/kernel/file_systems/packagefs/resolvables/Resolvable.h diff --git a/src/add-ons/kernel/file_systems/packagefs/ResolvableFamily.cpp b/src/add-ons/kernel/file_systems/packagefs/resolvables/ResolvableFamily.cpp similarity index 100% rename from src/add-ons/kernel/file_systems/packagefs/ResolvableFamily.cpp rename to src/add-ons/kernel/file_systems/packagefs/resolvables/ResolvableFamily.cpp diff --git a/src/add-ons/kernel/file_systems/packagefs/ResolvableFamily.h b/src/add-ons/kernel/file_systems/packagefs/resolvables/ResolvableFamily.h similarity index 100% rename from src/add-ons/kernel/file_systems/packagefs/ResolvableFamily.h rename to src/add-ons/kernel/file_systems/packagefs/resolvables/ResolvableFamily.h diff --git a/src/add-ons/kernel/file_systems/packagefs/DebugSupport.cpp b/src/add-ons/kernel/file_systems/packagefs/util/DebugSupport.cpp similarity index 100% rename from src/add-ons/kernel/file_systems/packagefs/DebugSupport.cpp rename to src/add-ons/kernel/file_systems/packagefs/util/DebugSupport.cpp diff --git a/src/add-ons/kernel/file_systems/packagefs/DebugSupport.h b/src/add-ons/kernel/file_systems/packagefs/util/DebugSupport.h similarity index 100% rename from src/add-ons/kernel/file_systems/packagefs/DebugSupport.h rename to src/add-ons/kernel/file_systems/packagefs/util/DebugSupport.h diff --git a/src/add-ons/kernel/file_systems/packagefs/TwoKeyAVLTree.h b/src/add-ons/kernel/file_systems/packagefs/util/TwoKeyAVLTree.h similarity index 100% rename from src/add-ons/kernel/file_systems/packagefs/TwoKeyAVLTree.h rename to src/add-ons/kernel/file_systems/packagefs/util/TwoKeyAVLTree.h diff --git a/src/add-ons/kernel/file_systems/packagefs/Utils.h b/src/add-ons/kernel/file_systems/packagefs/util/Utils.h similarity index 100% rename from src/add-ons/kernel/file_systems/packagefs/Utils.h rename to src/add-ons/kernel/file_systems/packagefs/util/Utils.h diff --git a/src/add-ons/kernel/file_systems/packagefs/Version.cpp b/src/add-ons/kernel/file_systems/packagefs/util/Version.cpp similarity index 100% rename from src/add-ons/kernel/file_systems/packagefs/Version.cpp rename to src/add-ons/kernel/file_systems/packagefs/util/Version.cpp diff --git a/src/add-ons/kernel/file_systems/packagefs/Version.h b/src/add-ons/kernel/file_systems/packagefs/util/Version.h similarity index 100% rename from src/add-ons/kernel/file_systems/packagefs/Version.h rename to src/add-ons/kernel/file_systems/packagefs/util/Version.h diff --git a/src/add-ons/kernel/file_systems/packagefs/NodeListener.cpp b/src/add-ons/kernel/file_systems/packagefs/volume/NodeListener.cpp similarity index 100% rename from src/add-ons/kernel/file_systems/packagefs/NodeListener.cpp rename to src/add-ons/kernel/file_systems/packagefs/volume/NodeListener.cpp diff --git a/src/add-ons/kernel/file_systems/packagefs/NodeListener.h b/src/add-ons/kernel/file_systems/packagefs/volume/NodeListener.h similarity index 100% rename from src/add-ons/kernel/file_systems/packagefs/NodeListener.h rename to src/add-ons/kernel/file_systems/packagefs/volume/NodeListener.h diff --git a/src/add-ons/kernel/file_systems/packagefs/PackageFSRoot.cpp b/src/add-ons/kernel/file_systems/packagefs/volume/PackageFSRoot.cpp similarity index 100% rename from src/add-ons/kernel/file_systems/packagefs/PackageFSRoot.cpp rename to src/add-ons/kernel/file_systems/packagefs/volume/PackageFSRoot.cpp diff --git a/src/add-ons/kernel/file_systems/packagefs/PackageFSRoot.h b/src/add-ons/kernel/file_systems/packagefs/volume/PackageFSRoot.h similarity index 100% rename from src/add-ons/kernel/file_systems/packagefs/PackageFSRoot.h rename to src/add-ons/kernel/file_systems/packagefs/volume/PackageFSRoot.h diff --git a/src/add-ons/kernel/file_systems/packagefs/Volume.cpp b/src/add-ons/kernel/file_systems/packagefs/volume/Volume.cpp similarity index 100% rename from src/add-ons/kernel/file_systems/packagefs/Volume.cpp rename to src/add-ons/kernel/file_systems/packagefs/volume/Volume.cpp diff --git a/src/add-ons/kernel/file_systems/packagefs/Volume.h b/src/add-ons/kernel/file_systems/packagefs/volume/Volume.h similarity index 100% rename from src/add-ons/kernel/file_systems/packagefs/Volume.h rename to src/add-ons/kernel/file_systems/packagefs/volume/Volume.h