diff --git a/package/inc/ZipPackage.hxx b/package/inc/ZipPackage.hxx
new file mode 100644
index 000000000000..10eeaa99ac0e
--- /dev/null
+++ b/package/inc/ZipPackage.hxx
@@ -0,0 +1,162 @@
+/*************************************************************************
+ *
+ *  $RCSfile: ZipPackage.hxx,v $
+ *
+ *  $Revision: 1.3 $
+ *
+ *  last change: $Author: mtg $ $Date: 2000-11-21 10:45:20 $
+ *
+ *  The Contents of this file are made available subject to the terms of
+ *  either of the following licenses
+ *
+ *         - GNU Lesser General Public License Version 2.1
+ *         - Sun Industry Standards Source License Version 1.1
+ *
+ *  Sun Microsystems Inc., October, 2000
+ *
+ *  GNU Lesser General Public License Version 2.1
+ *  =============================================
+ *  Copyright 2000 by Sun Microsystems, Inc.
+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License version 2.1, as published by the Free Software Foundation.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *  MA  02111-1307  USA
+ *
+ *
+ *  Sun Industry Standards Source License Version 1.1
+ *  =================================================
+ *  The contents of this file are subject to the Sun Industry Standards
+ *  Source License Version 1.1 (the "License"); You may not use this file
+ *  except in compliance with the License. You may obtain a copy of the
+ *  License at http://www.openoffice.org/license.html.
+ *
+ *  Software provided under this License is provided on an "AS IS" basis,
+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
+ *  See the License for the specific provisions governing your rights and
+ *  obligations concerning the Software.
+ *
+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
+ *
+ *  Copyright: 2000 by Sun Microsystems, Inc.
+ *
+ *  All Rights Reserved.
+ *
+ *  Contributor(s): _______________________________________
+ *
+ *
+ ************************************************************************/
+#ifndef _ZIP_PACKAGE_HXX
+#define _ZIP_PACKAGE_HXX
+
+#ifndef _TOOLS_DEBUG_HXX
+#include <tools/debug.hxx>
+#endif
+
+#ifndef _CPPUHELPER_IMPLBASE4_HXX_
+#include <cppuhelper/implbase4.hxx> // helper for implementations
+#endif
+
+#ifndef _CPPUHELPER_FACTORY_HXX_
+#include <cppuhelper/factory.hxx>
+#endif
+
+#ifndef _COM_SUN_STAR_LANG_XINITIALIZATION_HPP_
+#include <com/sun/star/lang/XInitialization.hpp>
+#endif
+
+#ifndef _COM_SUN_STAR_CONTAINER_XHIERARCHICALNAMEACCESS_HPP_
+#include <com/sun/star/container/XHierarchicalNameAccess.hpp>
+#endif
+
+#ifndef _COM_SUN_STAR_LANG_XSINGLESERVICEFACTORY_HPP_
+#include <com/sun/star/lang/XSingleServiceFactory.hpp>
+#endif
+
+#ifndef _COM_SUN_STAR_UTIL_XCHANGESBATCH_HPP_
+#include <com/sun/star/util/XChangesBatch.hpp>
+#endif
+
+#ifndef _UCBHELPER_CONTENT_HXX
+#include <ucbhelper/content.hxx>
+#endif
+
+#ifndef _ZIP_FILE_HXX
+#include "ZipFile.hxx"
+#endif
+
+#ifndef _ZIP_OUTPUT_STREAM_HXX
+#include "ZipOutputStream.hxx"
+#endif
+
+#ifndef _ZIP_PACKAGE_FOLDER_HXX
+#include "ZipPackageFolder.hxx"
+#endif
+
+#ifndef _ZIP_PACKAGE_STREAM_HXX
+#include "ZipPackageStream.hxx"
+#endif
+
+#ifndef _ZIP_PACKAGE_SINK_HXX
+#include "ZipPackageSink.hxx"
+#endif
+
+#ifndef _ZIP_PACKAGE_BUFFER_HXX
+#include "ZipPackageBuffer.hxx"
+#endif
+
+class ZipPackage : public cppu::WeakImplHelper4<
+                        com::sun::star::lang::XInitialization,
+                        com::sun::star::container::XHierarchicalNameAccess,
+                        com::sun::star::lang::XSingleServiceFactory,
+                        com::sun::star::util::XChangesBatch
+                        >
+{
+private:
+    ZipPackageFolder *pRootFolder;
+    ::ucb::Content  *pContent;
+    ::com::sun::star::uno::Reference < com::sun::star::io::XInputStream > xStream;
+public:
+    ZipFile          *pZipFile;
+    ZipOutputStream  *pZipOut;
+    ZipPackageBuffer *pZipBuffer;
+    ZipPackage (com::sun::star::uno::Reference < com::sun::star::io::XInputStream > xInput);
+    ZipPackage (void);
+    virtual ~ZipPackage( void );
+    // XInitialization
+    virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments )
+        throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
+    // XHierarchicalNameAccess
+    virtual ::com::sun::star::uno::Any SAL_CALL getByHierarchicalName( const ::rtl::OUString& aName )
+        throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL hasByHierarchicalName( const ::rtl::OUString& aName )
+        throw(::com::sun::star::uno::RuntimeException);
+    // XSingleServiceFactory
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance(  )
+        throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithArguments( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments )
+        throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
+    // XChangesBatch
+    virtual void SAL_CALL commitChanges(  )
+        throw(::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL hasPendingChanges(  )
+        throw(::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::util::ElementChange > SAL_CALL getPendingChanges(  )
+        throw(::com::sun::star::uno::RuntimeException);
+    // Uno componentiseralation
+    com::sun::star::uno::Reference< com::sun::star::uno::XInterface > ZipFile_create(
+            const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > & xMgr );
+};
+#endif
diff --git a/package/inc/ZipPackageBuffer.hxx b/package/inc/ZipPackageBuffer.hxx
index ef0934f637f2..c973389186d5 100644
--- a/package/inc/ZipPackageBuffer.hxx
+++ b/package/inc/ZipPackageBuffer.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ZipPackageBuffer.hxx,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: mtg $ $Date: 2000-11-21 10:18:06 $
+ *  last change: $Author: mtg $ $Date: 2000-11-21 10:45:20 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -85,6 +85,7 @@ class ZipPackageBuffer :
 private:
     com::sun::star::uno::Sequence < sal_Int8 > aBuffer;
     sal_Int64 nBufferSize;
+    sal_Int64 nEnd;
     sal_Int64 nCurrent;
 public:
     ZipPackageBuffer(sal_Int64 nNewBufferSize);
diff --git a/package/inc/ZipPackageFolder.hxx b/package/inc/ZipPackageFolder.hxx
new file mode 100644
index 000000000000..48f2cf4be721
--- /dev/null
+++ b/package/inc/ZipPackageFolder.hxx
@@ -0,0 +1,213 @@
+/*************************************************************************
+ *
+ *  $RCSfile: ZipPackageFolder.hxx,v $
+ *
+ *  $Revision: 1.3 $
+ *
+ *  last change: $Author: mtg $ $Date: 2000-11-21 10:45:20 $
+ *
+ *  The Contents of this file are made available subject to the terms of
+ *  either of the following licenses
+ *
+ *         - GNU Lesser General Public License Version 2.1
+ *         - Sun Industry Standards Source License Version 1.1
+ *
+ *  Sun Microsystems Inc., October, 2000
+ *
+ *  GNU Lesser General Public License Version 2.1
+ *  =============================================
+ *  Copyright 2000 by Sun Microsystems, Inc.
+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License version 2.1, as published by the Free Software Foundation.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *  MA  02111-1307  USA
+ *
+ *
+ *  Sun Industry Standards Source License Version 1.1
+ *  =================================================
+ *  The contents of this file are subject to the Sun Industry Standards
+ *  Source License Version 1.1 (the "License"); You may not use this file
+ *  except in compliance with the License. You may obtain a copy of the
+ *  License at http://www.openoffice.org/license.html.
+ *
+ *  Software provided under this License is provided on an "AS IS" basis,
+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
+ *  See the License for the specific provisions governing your rights and
+ *  obligations concerning the Software.
+ *
+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
+ *
+ *  Copyright: 2000 by Sun Microsystems, Inc.
+ *
+ *  All Rights Reserved.
+ *
+ *  Contributor(s): _______________________________________
+ *
+ *
+ ************************************************************************/
+#ifndef _ZIP_PACKAGE_FOLDER_HXX
+#define _ZIP_PACKAGE_FOLDER_HXX
+
+#ifndef _TOOLS_DEBUG_HXX
+#include <tools/debug.hxx>
+#endif
+
+#ifndef _COM_SUN_STAR_IO_XOUTPUTSTREAM_HPP_
+#include <com/sun/star/io/XOutputStream.hpp>
+#endif
+
+#ifndef _COM_SUN_STAR_IO_XACTIVEDATASINK_HPP_
+#include <com/sun/star/io/XActiveDataSink.hpp>
+#endif
+
+#ifndef _COM_SUN_STAR_CONTAINER_XNAMECONTAINER_HPP_
+#include <com/sun/star/container/XNameContainer.hpp>
+#endif
+
+#ifndef _COM_SUN_STAR_CONTAINER_XENUMERATIONACCESS_HPP_
+#include <com/sun/star/container/XEnumerationAccess.hpp>
+#endif
+
+#ifndef __com_sun_star_package_ZipEntry_hpp__
+#include <com/sun/star/package/ZipEntry.hpp>
+#endif
+
+#ifndef __com_sun_star_beans_XPropertySet_hpp__
+#include <com/sun/star/beans/XPropertySet.hpp>
+#endif
+
+#ifndef __com_sun_star_lang_XUnoTunnel_hpp__
+#include <com/sun/star/lang/XUnoTunnel.hpp>
+#endif
+
+#ifndef _CPPUHELPER_TYPEPROVIDER_HXX_
+#include <cppuhelper/typeprovider.hxx>
+#endif
+
+#include <hash_map>
+
+struct eqFunc
+{
+    sal_Bool operator()( const rtl::OUString &r1,
+                         const rtl::OUString &r2) const
+    {
+        return r1 == r2;
+    }
+};
+
+struct hashFunc
+{
+    sal_Int32 operator()(const rtl::OUString &r1) const
+    {
+        return r1.hashCode();
+    }
+};
+//#include "ZipPackageStream.hxx"
+
+/* This include must be after the above struct and typedef declarations.
+ * Ugly...but true :)
+ */
+
+#ifndef _ZIP_PACKAGE_FOLDER_ENUMERATION_HXX
+#include "ZipPackageFolderEnumeration.hxx"
+#endif
+
+#ifndef _ZIP_PACKAGE_ENTRY_HXX
+#include "ZipPackageEntry.hxx"
+#endif
+
+#ifndef _ZIP_PACKAGE_STREAM_HXX
+#include "ZipPackageStream.hxx"
+#endif
+
+#ifndef _ZIP_OUTPUT_STREAM_HXX
+#include "ZipOutputStream.hxx"
+#endif
+
+typedef std::hash_map < rtl::OUString, com::sun::star::uno::Reference < com::sun::star::lang::XUnoTunnel > , hashFunc, eqFunc > TunnelHash;
+
+class ZipPackageFolder : public ZipPackageEntry,
+                         public ::com::sun::star::container::XNameContainer,
+                         public ::com::sun::star::container::XEnumerationAccess,
+                         public ::com::sun::star::beans::XPropertySet,
+                         public ::com::sun::star::lang::XUnoTunnel
+{
+private:
+    //std::hash_map < rtl::OUString, ZipPackageFolder, hashFunc, eqFunc > aFolders;
+    //StreamHash aStreams;
+    ZipOutputStream &rZipOut;
+    ::rtl::OUString sMediaType;
+    TunnelHash aContents;
+    com::sun::star::uno::Reference < com::sun::star::uno::XInterface > xParent;
+public:
+    ZipPackageFolder (ZipOutputStream &rStream );//ZipPackage &rInPackage);
+    void  saveContents(rtl::OUString &rPath);
+    inline sal_Bool isFolder( void ) {return sal_True;}
+    inline sal_Bool isStream( void ) {return sal_False;}
+
+    virtual ~ZipPackageFolder( void );
+    // XInterface
+    virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& rType )
+        throw(::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL acquire(  )
+        throw();
+    virtual void SAL_CALL release(  )
+        throw();
+    // XNameContainer
+    virtual void SAL_CALL insertByName( const ::rtl::OUString& aName, const ::com::sun::star::uno::Any& aElement )
+        throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL removeByName( const ::rtl::OUString& Name )
+        throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+    // XEnumerationAccess
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createEnumeration(  )
+        throw(::com::sun::star::uno::RuntimeException);
+    // XElementAccess
+    virtual ::com::sun::star::uno::Type SAL_CALL getElementType(  )
+        throw(::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL hasElements(  )
+        throw(::com::sun::star::uno::RuntimeException);
+    // XNameAccess
+    virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName )
+        throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames(  )
+        throw(::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName )
+        throw(::com::sun::star::uno::RuntimeException);
+    // XNameReplace
+    virtual void SAL_CALL replaceByName( const ::rtl::OUString& aName, const ::com::sun::star::uno::Any& aElement )
+        throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+    // XPropertySet
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  )
+        throw(::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue )
+        throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName )
+        throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener )
+        throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener )
+        throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener )
+        throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener )
+        throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+    // XUnoTunnel
+    virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier )
+        throw(::com::sun::star::uno::RuntimeException);
+    static ::com::sun::star::uno::Sequence < sal_Int8 > getUnoTunnelImplementationId( void )
+        throw(::com::sun::star::uno::RuntimeException);
+};
+#endif