diff --git a/classes1/Autoloader.php b/classes/Autoloader.php similarity index 100% rename from classes1/Autoloader.php rename to classes/Autoloader.php diff --git a/classes1/Bootstrap.php b/classes/Bootstrap.php similarity index 100% rename from classes1/Bootstrap.php rename to classes/Bootstrap.php diff --git a/classes1/src/Autoloader.php b/classes/src/Autoloader.php similarity index 100% rename from classes1/src/Autoloader.php rename to classes/src/Autoloader.php diff --git a/classes1/src/CachedObjectStorage/APC.php b/classes/src/CachedObjectStorage/APC.php similarity index 100% rename from classes1/src/CachedObjectStorage/APC.php rename to classes/src/CachedObjectStorage/APC.php diff --git a/classes1/src/CachedObjectStorage/CacheBase.php b/classes/src/CachedObjectStorage/CacheBase.php similarity index 100% rename from classes1/src/CachedObjectStorage/CacheBase.php rename to classes/src/CachedObjectStorage/CacheBase.php diff --git a/classes1/src/CachedObjectStorage/DiscISAM.php b/classes/src/CachedObjectStorage/DiscISAM.php similarity index 100% rename from classes1/src/CachedObjectStorage/DiscISAM.php rename to classes/src/CachedObjectStorage/DiscISAM.php diff --git a/classes1/src/CachedObjectStorage/ICache.php b/classes/src/CachedObjectStorage/ICache.php similarity index 100% rename from classes1/src/CachedObjectStorage/ICache.php rename to classes/src/CachedObjectStorage/ICache.php diff --git a/classes1/src/CachedObjectStorage/Igbinary.php b/classes/src/CachedObjectStorage/Igbinary.php similarity index 100% rename from classes1/src/CachedObjectStorage/Igbinary.php rename to classes/src/CachedObjectStorage/Igbinary.php diff --git a/classes1/src/CachedObjectStorage/Memcache.php b/classes/src/CachedObjectStorage/Memcache.php similarity index 100% rename from classes1/src/CachedObjectStorage/Memcache.php rename to classes/src/CachedObjectStorage/Memcache.php diff --git a/classes1/src/CachedObjectStorage/Memory.php b/classes/src/CachedObjectStorage/Memory.php similarity index 100% rename from classes1/src/CachedObjectStorage/Memory.php rename to classes/src/CachedObjectStorage/Memory.php diff --git a/classes1/src/CachedObjectStorage/MemoryGZip.php b/classes/src/CachedObjectStorage/MemoryGZip.php similarity index 100% rename from classes1/src/CachedObjectStorage/MemoryGZip.php rename to classes/src/CachedObjectStorage/MemoryGZip.php diff --git a/classes1/src/CachedObjectStorage/MemorySerialized.php b/classes/src/CachedObjectStorage/MemorySerialized.php similarity index 100% rename from classes1/src/CachedObjectStorage/MemorySerialized.php rename to classes/src/CachedObjectStorage/MemorySerialized.php diff --git a/classes1/src/CachedObjectStorage/PHPTemp.php b/classes/src/CachedObjectStorage/PHPTemp.php similarity index 100% rename from classes1/src/CachedObjectStorage/PHPTemp.php rename to classes/src/CachedObjectStorage/PHPTemp.php diff --git a/classes1/src/CachedObjectStorage/SQLite.php b/classes/src/CachedObjectStorage/SQLite.php similarity index 100% rename from classes1/src/CachedObjectStorage/SQLite.php rename to classes/src/CachedObjectStorage/SQLite.php diff --git a/classes1/src/CachedObjectStorage/SQLite3.php b/classes/src/CachedObjectStorage/SQLite3.php similarity index 100% rename from classes1/src/CachedObjectStorage/SQLite3.php rename to classes/src/CachedObjectStorage/SQLite3.php diff --git a/classes1/src/CachedObjectStorage/Wincache.php b/classes/src/CachedObjectStorage/Wincache.php similarity index 100% rename from classes1/src/CachedObjectStorage/Wincache.php rename to classes/src/CachedObjectStorage/Wincache.php diff --git a/classes1/src/CachedObjectStorageFactory.php b/classes/src/CachedObjectStorageFactory.php similarity index 100% rename from classes1/src/CachedObjectStorageFactory.php rename to classes/src/CachedObjectStorageFactory.php diff --git a/classes1/src/CalcEngine/CyclicReferenceStack.php b/classes/src/CalcEngine/CyclicReferenceStack.php similarity index 100% rename from classes1/src/CalcEngine/CyclicReferenceStack.php rename to classes/src/CalcEngine/CyclicReferenceStack.php diff --git a/classes1/src/CalcEngine/Logger.php b/classes/src/CalcEngine/Logger.php similarity index 100% rename from classes1/src/CalcEngine/Logger.php rename to classes/src/CalcEngine/Logger.php diff --git a/classes1/src/Calculation.php b/classes/src/Calculation.php similarity index 100% rename from classes1/src/Calculation.php rename to classes/src/Calculation.php diff --git a/classes1/src/Calculation/Database.php b/classes/src/Calculation/Database.php similarity index 100% rename from classes1/src/Calculation/Database.php rename to classes/src/Calculation/Database.php diff --git a/classes1/src/Calculation/DateTime.php b/classes/src/Calculation/DateTime.php similarity index 100% rename from classes1/src/Calculation/DateTime.php rename to classes/src/Calculation/DateTime.php diff --git a/classes1/src/Calculation/Engineering.php b/classes/src/Calculation/Engineering.php similarity index 100% rename from classes1/src/Calculation/Engineering.php rename to classes/src/Calculation/Engineering.php diff --git a/classes1/src/Calculation/Exception.php b/classes/src/Calculation/Exception.php similarity index 100% rename from classes1/src/Calculation/Exception.php rename to classes/src/Calculation/Exception.php diff --git a/classes1/src/Calculation/ExceptionHandler.php b/classes/src/Calculation/ExceptionHandler.php similarity index 100% rename from classes1/src/Calculation/ExceptionHandler.php rename to classes/src/Calculation/ExceptionHandler.php diff --git a/classes1/src/Calculation/Financial.php b/classes/src/Calculation/Financial.php similarity index 100% rename from classes1/src/Calculation/Financial.php rename to classes/src/Calculation/Financial.php diff --git a/classes1/src/Calculation/FormulaParser.php b/classes/src/Calculation/FormulaParser.php similarity index 100% rename from classes1/src/Calculation/FormulaParser.php rename to classes/src/Calculation/FormulaParser.php diff --git a/classes1/src/Calculation/FormulaToken.php b/classes/src/Calculation/FormulaToken.php similarity index 100% rename from classes1/src/Calculation/FormulaToken.php rename to classes/src/Calculation/FormulaToken.php diff --git a/classes1/src/Calculation/Function.php b/classes/src/Calculation/Function.php similarity index 100% rename from classes1/src/Calculation/Function.php rename to classes/src/Calculation/Function.php diff --git a/classes1/src/Calculation/Functions.php b/classes/src/Calculation/Functions.php similarity index 100% rename from classes1/src/Calculation/Functions.php rename to classes/src/Calculation/Functions.php diff --git a/classes1/src/Calculation/Logical.php b/classes/src/Calculation/Logical.php similarity index 100% rename from classes1/src/Calculation/Logical.php rename to classes/src/Calculation/Logical.php diff --git a/classes1/src/Calculation/LookupRef.php b/classes/src/Calculation/LookupRef.php similarity index 100% rename from classes1/src/Calculation/LookupRef.php rename to classes/src/Calculation/LookupRef.php diff --git a/classes1/src/Calculation/MathTrig.php b/classes/src/Calculation/MathTrig.php similarity index 100% rename from classes1/src/Calculation/MathTrig.php rename to classes/src/Calculation/MathTrig.php diff --git a/classes1/src/Calculation/Statistical.php b/classes/src/Calculation/Statistical.php similarity index 100% rename from classes1/src/Calculation/Statistical.php rename to classes/src/Calculation/Statistical.php diff --git a/classes1/src/Calculation/TextData.php b/classes/src/Calculation/TextData.php similarity index 100% rename from classes1/src/Calculation/TextData.php rename to classes/src/Calculation/TextData.php diff --git a/classes1/src/Calculation/Token/Stack.php b/classes/src/Calculation/Token/Stack.php similarity index 100% rename from classes1/src/Calculation/Token/Stack.php rename to classes/src/Calculation/Token/Stack.php diff --git a/classes1/src/Calculation/functionlist.txt b/classes/src/Calculation/functionlist.txt similarity index 100% rename from classes1/src/Calculation/functionlist.txt rename to classes/src/Calculation/functionlist.txt diff --git a/classes1/src/Cell.php b/classes/src/Cell.php similarity index 100% rename from classes1/src/Cell.php rename to classes/src/Cell.php diff --git a/classes1/src/Cell/AdvancedValueBinder.php b/classes/src/Cell/AdvancedValueBinder.php similarity index 100% rename from classes1/src/Cell/AdvancedValueBinder.php rename to classes/src/Cell/AdvancedValueBinder.php diff --git a/classes1/src/Cell/DataType.php b/classes/src/Cell/DataType.php similarity index 100% rename from classes1/src/Cell/DataType.php rename to classes/src/Cell/DataType.php diff --git a/classes1/src/Cell/DataValidation.php b/classes/src/Cell/DataValidation.php similarity index 100% rename from classes1/src/Cell/DataValidation.php rename to classes/src/Cell/DataValidation.php diff --git a/classes1/src/Cell/DefaultValueBinder.php b/classes/src/Cell/DefaultValueBinder.php similarity index 100% rename from classes1/src/Cell/DefaultValueBinder.php rename to classes/src/Cell/DefaultValueBinder.php diff --git a/classes1/src/Cell/Hyperlink.php b/classes/src/Cell/Hyperlink.php similarity index 100% rename from classes1/src/Cell/Hyperlink.php rename to classes/src/Cell/Hyperlink.php diff --git a/classes1/src/Cell/IValueBinder.php b/classes/src/Cell/IValueBinder.php similarity index 100% rename from classes1/src/Cell/IValueBinder.php rename to classes/src/Cell/IValueBinder.php diff --git a/classes1/src/Chart.php b/classes/src/Chart.php similarity index 100% rename from classes1/src/Chart.php rename to classes/src/Chart.php diff --git a/classes1/src/Chart/Axis.php b/classes/src/Chart/Axis.php similarity index 100% rename from classes1/src/Chart/Axis.php rename to classes/src/Chart/Axis.php diff --git a/classes1/src/Chart/DataSeries.php b/classes/src/Chart/DataSeries.php similarity index 100% rename from classes1/src/Chart/DataSeries.php rename to classes/src/Chart/DataSeries.php diff --git a/classes1/src/Chart/DataSeriesValues.php b/classes/src/Chart/DataSeriesValues.php similarity index 100% rename from classes1/src/Chart/DataSeriesValues.php rename to classes/src/Chart/DataSeriesValues.php diff --git a/classes1/src/Chart/Exception.php b/classes/src/Chart/Exception.php similarity index 100% rename from classes1/src/Chart/Exception.php rename to classes/src/Chart/Exception.php diff --git a/classes1/src/Chart/GridLines.php b/classes/src/Chart/GridLines.php similarity index 100% rename from classes1/src/Chart/GridLines.php rename to classes/src/Chart/GridLines.php diff --git a/classes1/src/Chart/Layout.php b/classes/src/Chart/Layout.php similarity index 100% rename from classes1/src/Chart/Layout.php rename to classes/src/Chart/Layout.php diff --git a/classes1/src/Chart/Legend.php b/classes/src/Chart/Legend.php similarity index 100% rename from classes1/src/Chart/Legend.php rename to classes/src/Chart/Legend.php diff --git a/classes1/src/Chart/PlotArea.php b/classes/src/Chart/PlotArea.php similarity index 100% rename from classes1/src/Chart/PlotArea.php rename to classes/src/Chart/PlotArea.php diff --git a/classes1/src/Chart/Properties.php b/classes/src/Chart/Properties.php similarity index 100% rename from classes1/src/Chart/Properties.php rename to classes/src/Chart/Properties.php diff --git a/classes1/src/Chart/Renderer/PHP Charting Libraries.txt b/classes/src/Chart/Renderer/PHP Charting Libraries.txt similarity index 100% rename from classes1/src/Chart/Renderer/PHP Charting Libraries.txt rename to classes/src/Chart/Renderer/PHP Charting Libraries.txt diff --git a/classes1/src/Chart/Renderer/jpgraph.php b/classes/src/Chart/Renderer/jpgraph.php similarity index 100% rename from classes1/src/Chart/Renderer/jpgraph.php rename to classes/src/Chart/Renderer/jpgraph.php diff --git a/classes1/src/Chart/Title.php b/classes/src/Chart/Title.php similarity index 100% rename from classes1/src/Chart/Title.php rename to classes/src/Chart/Title.php diff --git a/classes1/src/Comment.php b/classes/src/Comment.php similarity index 100% rename from classes1/src/Comment.php rename to classes/src/Comment.php diff --git a/classes1/src/Document/Properties.php b/classes/src/Document/Properties.php similarity index 100% rename from classes1/src/Document/Properties.php rename to classes/src/Document/Properties.php diff --git a/classes1/src/Document/Security.php b/classes/src/Document/Security.php similarity index 100% rename from classes1/src/Document/Security.php rename to classes/src/Document/Security.php diff --git a/classes1/src/Exception.php b/classes/src/Exception.php similarity index 100% rename from classes1/src/Exception.php rename to classes/src/Exception.php diff --git a/classes1/src/HashTable.php b/classes/src/HashTable.php similarity index 100% rename from classes1/src/HashTable.php rename to classes/src/HashTable.php diff --git a/classes1/src/Helper/HTML.php b/classes/src/Helper/HTML.php similarity index 100% rename from classes1/src/Helper/HTML.php rename to classes/src/Helper/HTML.php diff --git a/classes1/src/IComparable.php b/classes/src/IComparable.php similarity index 100% rename from classes1/src/IComparable.php rename to classes/src/IComparable.php diff --git a/classes1/src/IOFactory.php b/classes/src/IOFactory.php similarity index 100% rename from classes1/src/IOFactory.php rename to classes/src/IOFactory.php diff --git a/classes1/src/NamedRange.php b/classes/src/NamedRange.php similarity index 100% rename from classes1/src/NamedRange.php rename to classes/src/NamedRange.php diff --git a/classes1/src/Reader/Abstract.php b/classes/src/Reader/Abstract.php similarity index 100% rename from classes1/src/Reader/Abstract.php rename to classes/src/Reader/Abstract.php diff --git a/classes1/src/Reader/CSV.php b/classes/src/Reader/CSV.php similarity index 100% rename from classes1/src/Reader/CSV.php rename to classes/src/Reader/CSV.php diff --git a/classes1/src/Reader/DefaultReadFilter.php b/classes/src/Reader/DefaultReadFilter.php similarity index 100% rename from classes1/src/Reader/DefaultReadFilter.php rename to classes/src/Reader/DefaultReadFilter.php diff --git a/classes1/src/Reader/Excel2003XML.php b/classes/src/Reader/Excel2003XML.php similarity index 100% rename from classes1/src/Reader/Excel2003XML.php rename to classes/src/Reader/Excel2003XML.php diff --git a/classes1/src/Reader/Excel2007.php b/classes/src/Reader/Excel2007.php similarity index 100% rename from classes1/src/Reader/Excel2007.php rename to classes/src/Reader/Excel2007.php diff --git a/classes1/src/Reader/Excel2007/Chart.php b/classes/src/Reader/Excel2007/Chart.php similarity index 100% rename from classes1/src/Reader/Excel2007/Chart.php rename to classes/src/Reader/Excel2007/Chart.php diff --git a/classes1/src/Reader/Excel2007/Theme.php b/classes/src/Reader/Excel2007/Theme.php similarity index 100% rename from classes1/src/Reader/Excel2007/Theme.php rename to classes/src/Reader/Excel2007/Theme.php diff --git a/classes1/src/Reader/Excel5.php b/classes/src/Reader/Excel5.php similarity index 100% rename from classes1/src/Reader/Excel5.php rename to classes/src/Reader/Excel5.php diff --git a/classes1/src/Reader/Excel5/Escher.php b/classes/src/Reader/Excel5/Escher.php similarity index 100% rename from classes1/src/Reader/Excel5/Escher.php rename to classes/src/Reader/Excel5/Escher.php diff --git a/classes1/src/Reader/Excel5/MD5.php b/classes/src/Reader/Excel5/MD5.php similarity index 100% rename from classes1/src/Reader/Excel5/MD5.php rename to classes/src/Reader/Excel5/MD5.php diff --git a/classes1/src/Reader/Excel5/RC4.php b/classes/src/Reader/Excel5/RC4.php similarity index 100% rename from classes1/src/Reader/Excel5/RC4.php rename to classes/src/Reader/Excel5/RC4.php diff --git a/classes1/src/Reader/Exception.php b/classes/src/Reader/Exception.php similarity index 100% rename from classes1/src/Reader/Exception.php rename to classes/src/Reader/Exception.php diff --git a/classes1/src/Reader/Gnumeric.php b/classes/src/Reader/Gnumeric.php similarity index 100% rename from classes1/src/Reader/Gnumeric.php rename to classes/src/Reader/Gnumeric.php diff --git a/classes1/src/Reader/HTML.php b/classes/src/Reader/HTML.php similarity index 100% rename from classes1/src/Reader/HTML.php rename to classes/src/Reader/HTML.php diff --git a/classes1/src/Reader/IReadFilter.php b/classes/src/Reader/IReadFilter.php similarity index 100% rename from classes1/src/Reader/IReadFilter.php rename to classes/src/Reader/IReadFilter.php diff --git a/classes1/src/Reader/IReader.php b/classes/src/Reader/IReader.php similarity index 100% rename from classes1/src/Reader/IReader.php rename to classes/src/Reader/IReader.php diff --git a/classes1/src/Reader/OOCalc.php b/classes/src/Reader/OOCalc.php similarity index 100% rename from classes1/src/Reader/OOCalc.php rename to classes/src/Reader/OOCalc.php diff --git a/classes1/src/Reader/SYLK.php b/classes/src/Reader/SYLK.php similarity index 100% rename from classes1/src/Reader/SYLK.php rename to classes/src/Reader/SYLK.php diff --git a/classes1/src/ReferenceHelper.php b/classes/src/ReferenceHelper.php similarity index 100% rename from classes1/src/ReferenceHelper.php rename to classes/src/ReferenceHelper.php diff --git a/classes1/src/RichText.php b/classes/src/RichText.php similarity index 100% rename from classes1/src/RichText.php rename to classes/src/RichText.php diff --git a/classes1/src/RichText/ITextElement.php b/classes/src/RichText/ITextElement.php similarity index 100% rename from classes1/src/RichText/ITextElement.php rename to classes/src/RichText/ITextElement.php diff --git a/classes1/src/RichText/Run.php b/classes/src/RichText/Run.php similarity index 100% rename from classes1/src/RichText/Run.php rename to classes/src/RichText/Run.php diff --git a/classes1/src/RichText/TextElement.php b/classes/src/RichText/TextElement.php similarity index 100% rename from classes1/src/RichText/TextElement.php rename to classes/src/RichText/TextElement.php diff --git a/classes1/src/Settings.php b/classes/src/Settings.php similarity index 100% rename from classes1/src/Settings.php rename to classes/src/Settings.php diff --git a/classes1/src/Shared/CodePage.php b/classes/src/Shared/CodePage.php similarity index 100% rename from classes1/src/Shared/CodePage.php rename to classes/src/Shared/CodePage.php diff --git a/classes1/src/Shared/Date.php b/classes/src/Shared/Date.php similarity index 100% rename from classes1/src/Shared/Date.php rename to classes/src/Shared/Date.php diff --git a/classes1/src/Shared/Drawing.php b/classes/src/Shared/Drawing.php similarity index 100% rename from classes1/src/Shared/Drawing.php rename to classes/src/Shared/Drawing.php diff --git a/classes1/src/Shared/Escher.php b/classes/src/Shared/Escher.php similarity index 100% rename from classes1/src/Shared/Escher.php rename to classes/src/Shared/Escher.php diff --git a/classes1/src/Shared/Escher/DgContainer.php b/classes/src/Shared/Escher/DgContainer.php similarity index 100% rename from classes1/src/Shared/Escher/DgContainer.php rename to classes/src/Shared/Escher/DgContainer.php diff --git a/classes1/src/Shared/Escher/DgContainer/SpgrContainer.php b/classes/src/Shared/Escher/DgContainer/SpgrContainer.php similarity index 100% rename from classes1/src/Shared/Escher/DgContainer/SpgrContainer.php rename to classes/src/Shared/Escher/DgContainer/SpgrContainer.php diff --git a/classes1/src/Shared/Escher/DgContainer/SpgrContainer/SpContainer.php b/classes/src/Shared/Escher/DgContainer/SpgrContainer/SpContainer.php similarity index 100% rename from classes1/src/Shared/Escher/DgContainer/SpgrContainer/SpContainer.php rename to classes/src/Shared/Escher/DgContainer/SpgrContainer/SpContainer.php diff --git a/classes1/src/Shared/Escher/DggContainer.php b/classes/src/Shared/Escher/DggContainer.php similarity index 100% rename from classes1/src/Shared/Escher/DggContainer.php rename to classes/src/Shared/Escher/DggContainer.php diff --git a/classes1/src/Shared/Escher/DggContainer/BstoreContainer.php b/classes/src/Shared/Escher/DggContainer/BstoreContainer.php similarity index 100% rename from classes1/src/Shared/Escher/DggContainer/BstoreContainer.php rename to classes/src/Shared/Escher/DggContainer/BstoreContainer.php diff --git a/classes1/src/Shared/Escher/DggContainer/BstoreContainer/BSE.php b/classes/src/Shared/Escher/DggContainer/BstoreContainer/BSE.php similarity index 100% rename from classes1/src/Shared/Escher/DggContainer/BstoreContainer/BSE.php rename to classes/src/Shared/Escher/DggContainer/BstoreContainer/BSE.php diff --git a/classes1/src/Shared/Escher/DggContainer/BstoreContainer/BSE/Blip.php b/classes/src/Shared/Escher/DggContainer/BstoreContainer/BSE/Blip.php similarity index 100% rename from classes1/src/Shared/Escher/DggContainer/BstoreContainer/BSE/Blip.php rename to classes/src/Shared/Escher/DggContainer/BstoreContainer/BSE/Blip.php diff --git a/classes1/src/Shared/Excel5.php b/classes/src/Shared/Excel5.php similarity index 100% rename from classes1/src/Shared/Excel5.php rename to classes/src/Shared/Excel5.php diff --git a/classes1/src/Shared/File.php b/classes/src/Shared/File.php similarity index 100% rename from classes1/src/Shared/File.php rename to classes/src/Shared/File.php diff --git a/classes1/src/Shared/Font.php b/classes/src/Shared/Font.php similarity index 100% rename from classes1/src/Shared/Font.php rename to classes/src/Shared/Font.php diff --git a/classes1/src/Shared/JAMA/CHANGELOG.TXT b/classes/src/Shared/JAMA/CHANGELOG.TXT similarity index 100% rename from classes1/src/Shared/JAMA/CHANGELOG.TXT rename to classes/src/Shared/JAMA/CHANGELOG.TXT diff --git a/classes1/src/Shared/JAMA/CholeskyDecomposition.php b/classes/src/Shared/JAMA/CholeskyDecomposition.php similarity index 100% rename from classes1/src/Shared/JAMA/CholeskyDecomposition.php rename to classes/src/Shared/JAMA/CholeskyDecomposition.php diff --git a/classes1/src/Shared/JAMA/EigenvalueDecomposition.php b/classes/src/Shared/JAMA/EigenvalueDecomposition.php similarity index 100% rename from classes1/src/Shared/JAMA/EigenvalueDecomposition.php rename to classes/src/Shared/JAMA/EigenvalueDecomposition.php diff --git a/classes1/src/Shared/JAMA/LUDecomposition.php b/classes/src/Shared/JAMA/LUDecomposition.php similarity index 100% rename from classes1/src/Shared/JAMA/LUDecomposition.php rename to classes/src/Shared/JAMA/LUDecomposition.php diff --git a/classes1/src/Shared/JAMA/Matrix.php b/classes/src/Shared/JAMA/Matrix.php similarity index 100% rename from classes1/src/Shared/JAMA/Matrix.php rename to classes/src/Shared/JAMA/Matrix.php diff --git a/classes1/src/Shared/JAMA/QRDecomposition.php b/classes/src/Shared/JAMA/QRDecomposition.php similarity index 100% rename from classes1/src/Shared/JAMA/QRDecomposition.php rename to classes/src/Shared/JAMA/QRDecomposition.php diff --git a/classes1/src/Shared/JAMA/SingularValueDecomposition.php b/classes/src/Shared/JAMA/SingularValueDecomposition.php similarity index 100% rename from classes1/src/Shared/JAMA/SingularValueDecomposition.php rename to classes/src/Shared/JAMA/SingularValueDecomposition.php diff --git a/classes1/src/Shared/JAMA/utils/Error.php b/classes/src/Shared/JAMA/utils/Error.php similarity index 100% rename from classes1/src/Shared/JAMA/utils/Error.php rename to classes/src/Shared/JAMA/utils/Error.php diff --git a/classes1/src/Shared/JAMA/utils/Maths.php b/classes/src/Shared/JAMA/utils/Maths.php similarity index 100% rename from classes1/src/Shared/JAMA/utils/Maths.php rename to classes/src/Shared/JAMA/utils/Maths.php diff --git a/classes1/src/Shared/OLE.php b/classes/src/Shared/OLE.php similarity index 100% rename from classes1/src/Shared/OLE.php rename to classes/src/Shared/OLE.php diff --git a/classes1/src/Shared/OLE/ChainedBlockStream.php b/classes/src/Shared/OLE/ChainedBlockStream.php similarity index 100% rename from classes1/src/Shared/OLE/ChainedBlockStream.php rename to classes/src/Shared/OLE/ChainedBlockStream.php diff --git a/classes1/src/Shared/OLE/PPS.php b/classes/src/Shared/OLE/PPS.php similarity index 100% rename from classes1/src/Shared/OLE/PPS.php rename to classes/src/Shared/OLE/PPS.php diff --git a/classes1/src/Shared/OLE/PPS/File.php b/classes/src/Shared/OLE/PPS/File.php similarity index 100% rename from classes1/src/Shared/OLE/PPS/File.php rename to classes/src/Shared/OLE/PPS/File.php diff --git a/classes1/src/Shared/OLE/PPS/Root.php b/classes/src/Shared/OLE/PPS/Root.php similarity index 100% rename from classes1/src/Shared/OLE/PPS/Root.php rename to classes/src/Shared/OLE/PPS/Root.php diff --git a/classes1/src/Shared/OLERead.php b/classes/src/Shared/OLERead.php similarity index 100% rename from classes1/src/Shared/OLERead.php rename to classes/src/Shared/OLERead.php diff --git a/classes1/src/Shared/PCLZip/gnu-lgpl.txt b/classes/src/Shared/PCLZip/gnu-lgpl.txt similarity index 100% rename from classes1/src/Shared/PCLZip/gnu-lgpl.txt rename to classes/src/Shared/PCLZip/gnu-lgpl.txt diff --git a/classes1/src/Shared/PCLZip/pclzip.lib.php b/classes/src/Shared/PCLZip/pclzip.lib.php similarity index 100% rename from classes1/src/Shared/PCLZip/pclzip.lib.php rename to classes/src/Shared/PCLZip/pclzip.lib.php diff --git a/classes1/src/Shared/PCLZip/readme.txt b/classes/src/Shared/PCLZip/readme.txt similarity index 100% rename from classes1/src/Shared/PCLZip/readme.txt rename to classes/src/Shared/PCLZip/readme.txt diff --git a/classes1/src/Shared/PasswordHasher.php b/classes/src/Shared/PasswordHasher.php similarity index 100% rename from classes1/src/Shared/PasswordHasher.php rename to classes/src/Shared/PasswordHasher.php diff --git a/classes1/src/Shared/String.php b/classes/src/Shared/String.php similarity index 100% rename from classes1/src/Shared/String.php rename to classes/src/Shared/String.php diff --git a/classes1/src/Shared/TimeZone.php b/classes/src/Shared/TimeZone.php similarity index 100% rename from classes1/src/Shared/TimeZone.php rename to classes/src/Shared/TimeZone.php diff --git a/classes1/src/Shared/XMLWriter.php b/classes/src/Shared/XMLWriter.php similarity index 100% rename from classes1/src/Shared/XMLWriter.php rename to classes/src/Shared/XMLWriter.php diff --git a/classes1/src/Shared/ZipArchive.php b/classes/src/Shared/ZipArchive.php similarity index 100% rename from classes1/src/Shared/ZipArchive.php rename to classes/src/Shared/ZipArchive.php diff --git a/classes1/src/Shared/ZipStreamWrapper.php b/classes/src/Shared/ZipStreamWrapper.php similarity index 100% rename from classes1/src/Shared/ZipStreamWrapper.php rename to classes/src/Shared/ZipStreamWrapper.php diff --git a/classes1/src/Shared/trend/bestFitClass.php b/classes/src/Shared/trend/bestFitClass.php similarity index 100% rename from classes1/src/Shared/trend/bestFitClass.php rename to classes/src/Shared/trend/bestFitClass.php diff --git a/classes1/src/Shared/trend/exponentialBestFitClass.php b/classes/src/Shared/trend/exponentialBestFitClass.php similarity index 100% rename from classes1/src/Shared/trend/exponentialBestFitClass.php rename to classes/src/Shared/trend/exponentialBestFitClass.php diff --git a/classes1/src/Shared/trend/linearBestFitClass.php b/classes/src/Shared/trend/linearBestFitClass.php similarity index 100% rename from classes1/src/Shared/trend/linearBestFitClass.php rename to classes/src/Shared/trend/linearBestFitClass.php diff --git a/classes1/src/Shared/trend/logarithmicBestFitClass.php b/classes/src/Shared/trend/logarithmicBestFitClass.php similarity index 100% rename from classes1/src/Shared/trend/logarithmicBestFitClass.php rename to classes/src/Shared/trend/logarithmicBestFitClass.php diff --git a/classes1/src/Shared/trend/polynomialBestFitClass.php b/classes/src/Shared/trend/polynomialBestFitClass.php similarity index 100% rename from classes1/src/Shared/trend/polynomialBestFitClass.php rename to classes/src/Shared/trend/polynomialBestFitClass.php diff --git a/classes1/src/Shared/trend/powerBestFitClass.php b/classes/src/Shared/trend/powerBestFitClass.php similarity index 100% rename from classes1/src/Shared/trend/powerBestFitClass.php rename to classes/src/Shared/trend/powerBestFitClass.php diff --git a/classes1/src/Shared/trend/trendClass.php b/classes/src/Shared/trend/trendClass.php similarity index 100% rename from classes1/src/Shared/trend/trendClass.php rename to classes/src/Shared/trend/trendClass.php diff --git a/classes1/src/Spreadsheet.php b/classes/src/Spreadsheet.php similarity index 100% rename from classes1/src/Spreadsheet.php rename to classes/src/Spreadsheet.php diff --git a/classes1/src/Style.php b/classes/src/Style.php similarity index 100% rename from classes1/src/Style.php rename to classes/src/Style.php diff --git a/classes1/src/Style/Alignment.php b/classes/src/Style/Alignment.php similarity index 100% rename from classes1/src/Style/Alignment.php rename to classes/src/Style/Alignment.php diff --git a/classes1/src/Style/Border.php b/classes/src/Style/Border.php similarity index 100% rename from classes1/src/Style/Border.php rename to classes/src/Style/Border.php diff --git a/classes1/src/Style/Borders.php b/classes/src/Style/Borders.php similarity index 100% rename from classes1/src/Style/Borders.php rename to classes/src/Style/Borders.php diff --git a/classes1/src/Style/Color.php b/classes/src/Style/Color.php similarity index 100% rename from classes1/src/Style/Color.php rename to classes/src/Style/Color.php diff --git a/classes1/src/Style/Conditional.php b/classes/src/Style/Conditional.php similarity index 100% rename from classes1/src/Style/Conditional.php rename to classes/src/Style/Conditional.php diff --git a/classes1/src/Style/Fill.php b/classes/src/Style/Fill.php similarity index 100% rename from classes1/src/Style/Fill.php rename to classes/src/Style/Fill.php diff --git a/classes1/src/Style/Font.php b/classes/src/Style/Font.php similarity index 100% rename from classes1/src/Style/Font.php rename to classes/src/Style/Font.php diff --git a/classes1/src/Style/NumberFormat.php b/classes/src/Style/NumberFormat.php similarity index 100% rename from classes1/src/Style/NumberFormat.php rename to classes/src/Style/NumberFormat.php diff --git a/classes1/src/Style/Protection.php b/classes/src/Style/Protection.php similarity index 100% rename from classes1/src/Style/Protection.php rename to classes/src/Style/Protection.php diff --git a/classes1/src/Style/Supervisor.php b/classes/src/Style/Supervisor.php similarity index 100% rename from classes1/src/Style/Supervisor.php rename to classes/src/Style/Supervisor.php diff --git a/classes1/src/Worksheet.php b/classes/src/Worksheet.php similarity index 100% rename from classes1/src/Worksheet.php rename to classes/src/Worksheet.php diff --git a/classes1/src/Worksheet/AutoFilter.php b/classes/src/Worksheet/AutoFilter.php similarity index 100% rename from classes1/src/Worksheet/AutoFilter.php rename to classes/src/Worksheet/AutoFilter.php diff --git a/classes1/src/Worksheet/AutoFilter/Column.php b/classes/src/Worksheet/AutoFilter/Column.php similarity index 100% rename from classes1/src/Worksheet/AutoFilter/Column.php rename to classes/src/Worksheet/AutoFilter/Column.php diff --git a/classes1/src/Worksheet/AutoFilter/Column/Rule.php b/classes/src/Worksheet/AutoFilter/Column/Rule.php similarity index 100% rename from classes1/src/Worksheet/AutoFilter/Column/Rule.php rename to classes/src/Worksheet/AutoFilter/Column/Rule.php diff --git a/classes1/src/Worksheet/BaseDrawing.php b/classes/src/Worksheet/BaseDrawing.php similarity index 100% rename from classes1/src/Worksheet/BaseDrawing.php rename to classes/src/Worksheet/BaseDrawing.php diff --git a/classes1/src/Worksheet/CellIterator.php b/classes/src/Worksheet/CellIterator.php similarity index 100% rename from classes1/src/Worksheet/CellIterator.php rename to classes/src/Worksheet/CellIterator.php diff --git a/classes1/src/Worksheet/Column.php b/classes/src/Worksheet/Column.php similarity index 100% rename from classes1/src/Worksheet/Column.php rename to classes/src/Worksheet/Column.php diff --git a/classes1/src/Worksheet/ColumnCellIterator.php b/classes/src/Worksheet/ColumnCellIterator.php similarity index 100% rename from classes1/src/Worksheet/ColumnCellIterator.php rename to classes/src/Worksheet/ColumnCellIterator.php diff --git a/classes1/src/Worksheet/ColumnDimension.php b/classes/src/Worksheet/ColumnDimension.php similarity index 100% rename from classes1/src/Worksheet/ColumnDimension.php rename to classes/src/Worksheet/ColumnDimension.php diff --git a/classes1/src/Worksheet/ColumnIterator.php b/classes/src/Worksheet/ColumnIterator.php similarity index 100% rename from classes1/src/Worksheet/ColumnIterator.php rename to classes/src/Worksheet/ColumnIterator.php diff --git a/classes1/src/Worksheet/Dimension.php b/classes/src/Worksheet/Dimension.php similarity index 100% rename from classes1/src/Worksheet/Dimension.php rename to classes/src/Worksheet/Dimension.php diff --git a/classes1/src/Worksheet/Drawing.php b/classes/src/Worksheet/Drawing.php similarity index 100% rename from classes1/src/Worksheet/Drawing.php rename to classes/src/Worksheet/Drawing.php diff --git a/classes1/src/Worksheet/Drawing/Shadow.php b/classes/src/Worksheet/Drawing/Shadow.php similarity index 100% rename from classes1/src/Worksheet/Drawing/Shadow.php rename to classes/src/Worksheet/Drawing/Shadow.php diff --git a/classes1/src/Worksheet/HeaderFooter.php b/classes/src/Worksheet/HeaderFooter.php similarity index 100% rename from classes1/src/Worksheet/HeaderFooter.php rename to classes/src/Worksheet/HeaderFooter.php diff --git a/classes1/src/Worksheet/HeaderFooterDrawing.php b/classes/src/Worksheet/HeaderFooterDrawing.php similarity index 100% rename from classes1/src/Worksheet/HeaderFooterDrawing.php rename to classes/src/Worksheet/HeaderFooterDrawing.php diff --git a/classes1/src/Worksheet/Iterator.php b/classes/src/Worksheet/Iterator.php similarity index 100% rename from classes1/src/Worksheet/Iterator.php rename to classes/src/Worksheet/Iterator.php diff --git a/classes1/src/Worksheet/MemoryDrawing.php b/classes/src/Worksheet/MemoryDrawing.php similarity index 100% rename from classes1/src/Worksheet/MemoryDrawing.php rename to classes/src/Worksheet/MemoryDrawing.php diff --git a/classes1/src/Worksheet/PageMargins.php b/classes/src/Worksheet/PageMargins.php similarity index 100% rename from classes1/src/Worksheet/PageMargins.php rename to classes/src/Worksheet/PageMargins.php diff --git a/classes1/src/Worksheet/PageSetup.php b/classes/src/Worksheet/PageSetup.php similarity index 100% rename from classes1/src/Worksheet/PageSetup.php rename to classes/src/Worksheet/PageSetup.php diff --git a/classes1/src/Worksheet/Protection.php b/classes/src/Worksheet/Protection.php similarity index 100% rename from classes1/src/Worksheet/Protection.php rename to classes/src/Worksheet/Protection.php diff --git a/classes1/src/Worksheet/Row.php b/classes/src/Worksheet/Row.php similarity index 100% rename from classes1/src/Worksheet/Row.php rename to classes/src/Worksheet/Row.php diff --git a/classes1/src/Worksheet/RowCellIterator.php b/classes/src/Worksheet/RowCellIterator.php similarity index 100% rename from classes1/src/Worksheet/RowCellIterator.php rename to classes/src/Worksheet/RowCellIterator.php diff --git a/classes1/src/Worksheet/RowDimension.php b/classes/src/Worksheet/RowDimension.php similarity index 100% rename from classes1/src/Worksheet/RowDimension.php rename to classes/src/Worksheet/RowDimension.php diff --git a/classes1/src/Worksheet/RowIterator.php b/classes/src/Worksheet/RowIterator.php similarity index 100% rename from classes1/src/Worksheet/RowIterator.php rename to classes/src/Worksheet/RowIterator.php diff --git a/classes1/src/Worksheet/SheetView.php b/classes/src/Worksheet/SheetView.php similarity index 100% rename from classes1/src/Worksheet/SheetView.php rename to classes/src/Worksheet/SheetView.php diff --git a/classes1/src/Writer/Abstract.php b/classes/src/Writer/Abstract.php similarity index 100% rename from classes1/src/Writer/Abstract.php rename to classes/src/Writer/Abstract.php diff --git a/classes1/src/Writer/CSV.php b/classes/src/Writer/CSV.php similarity index 100% rename from classes1/src/Writer/CSV.php rename to classes/src/Writer/CSV.php diff --git a/classes1/src/Writer/Excel2007.php b/classes/src/Writer/Excel2007.php similarity index 100% rename from classes1/src/Writer/Excel2007.php rename to classes/src/Writer/Excel2007.php diff --git a/classes1/src/Writer/Excel2007/Chart.php b/classes/src/Writer/Excel2007/Chart.php similarity index 100% rename from classes1/src/Writer/Excel2007/Chart.php rename to classes/src/Writer/Excel2007/Chart.php diff --git a/classes1/src/Writer/Excel2007/Comments.php b/classes/src/Writer/Excel2007/Comments.php similarity index 100% rename from classes1/src/Writer/Excel2007/Comments.php rename to classes/src/Writer/Excel2007/Comments.php diff --git a/classes1/src/Writer/Excel2007/ContentTypes.php b/classes/src/Writer/Excel2007/ContentTypes.php similarity index 100% rename from classes1/src/Writer/Excel2007/ContentTypes.php rename to classes/src/Writer/Excel2007/ContentTypes.php diff --git a/classes1/src/Writer/Excel2007/DocProps.php b/classes/src/Writer/Excel2007/DocProps.php similarity index 100% rename from classes1/src/Writer/Excel2007/DocProps.php rename to classes/src/Writer/Excel2007/DocProps.php diff --git a/classes1/src/Writer/Excel2007/Drawing.php b/classes/src/Writer/Excel2007/Drawing.php similarity index 100% rename from classes1/src/Writer/Excel2007/Drawing.php rename to classes/src/Writer/Excel2007/Drawing.php diff --git a/classes1/src/Writer/Excel2007/Rels.php b/classes/src/Writer/Excel2007/Rels.php similarity index 100% rename from classes1/src/Writer/Excel2007/Rels.php rename to classes/src/Writer/Excel2007/Rels.php diff --git a/classes1/src/Writer/Excel2007/RelsRibbon.php b/classes/src/Writer/Excel2007/RelsRibbon.php similarity index 100% rename from classes1/src/Writer/Excel2007/RelsRibbon.php rename to classes/src/Writer/Excel2007/RelsRibbon.php diff --git a/classes1/src/Writer/Excel2007/RelsVBA.php b/classes/src/Writer/Excel2007/RelsVBA.php similarity index 100% rename from classes1/src/Writer/Excel2007/RelsVBA.php rename to classes/src/Writer/Excel2007/RelsVBA.php diff --git a/classes1/src/Writer/Excel2007/StringTable.php b/classes/src/Writer/Excel2007/StringTable.php similarity index 100% rename from classes1/src/Writer/Excel2007/StringTable.php rename to classes/src/Writer/Excel2007/StringTable.php diff --git a/classes1/src/Writer/Excel2007/Style.php b/classes/src/Writer/Excel2007/Style.php similarity index 100% rename from classes1/src/Writer/Excel2007/Style.php rename to classes/src/Writer/Excel2007/Style.php diff --git a/classes1/src/Writer/Excel2007/Theme.php b/classes/src/Writer/Excel2007/Theme.php similarity index 100% rename from classes1/src/Writer/Excel2007/Theme.php rename to classes/src/Writer/Excel2007/Theme.php diff --git a/classes1/src/Writer/Excel2007/Workbook.php b/classes/src/Writer/Excel2007/Workbook.php similarity index 100% rename from classes1/src/Writer/Excel2007/Workbook.php rename to classes/src/Writer/Excel2007/Workbook.php diff --git a/classes1/src/Writer/Excel2007/Worksheet.php b/classes/src/Writer/Excel2007/Worksheet.php similarity index 100% rename from classes1/src/Writer/Excel2007/Worksheet.php rename to classes/src/Writer/Excel2007/Worksheet.php diff --git a/classes1/src/Writer/Excel2007/WriterPart.php b/classes/src/Writer/Excel2007/WriterPart.php similarity index 100% rename from classes1/src/Writer/Excel2007/WriterPart.php rename to classes/src/Writer/Excel2007/WriterPart.php diff --git a/classes1/src/Writer/Excel5.php b/classes/src/Writer/Excel5.php similarity index 100% rename from classes1/src/Writer/Excel5.php rename to classes/src/Writer/Excel5.php diff --git a/classes1/src/Writer/Excel5/BIFFwriter.php b/classes/src/Writer/Excel5/BIFFwriter.php similarity index 100% rename from classes1/src/Writer/Excel5/BIFFwriter.php rename to classes/src/Writer/Excel5/BIFFwriter.php diff --git a/classes1/src/Writer/Excel5/Escher.php b/classes/src/Writer/Excel5/Escher.php similarity index 100% rename from classes1/src/Writer/Excel5/Escher.php rename to classes/src/Writer/Excel5/Escher.php diff --git a/classes1/src/Writer/Excel5/Font.php b/classes/src/Writer/Excel5/Font.php similarity index 100% rename from classes1/src/Writer/Excel5/Font.php rename to classes/src/Writer/Excel5/Font.php diff --git a/classes1/src/Writer/Excel5/Parser.php b/classes/src/Writer/Excel5/Parser.php similarity index 100% rename from classes1/src/Writer/Excel5/Parser.php rename to classes/src/Writer/Excel5/Parser.php diff --git a/classes1/src/Writer/Excel5/Workbook.php b/classes/src/Writer/Excel5/Workbook.php similarity index 100% rename from classes1/src/Writer/Excel5/Workbook.php rename to classes/src/Writer/Excel5/Workbook.php diff --git a/classes1/src/Writer/Excel5/Worksheet.php b/classes/src/Writer/Excel5/Worksheet.php similarity index 100% rename from classes1/src/Writer/Excel5/Worksheet.php rename to classes/src/Writer/Excel5/Worksheet.php diff --git a/classes1/src/Writer/Excel5/Xf.php b/classes/src/Writer/Excel5/Xf.php similarity index 100% rename from classes1/src/Writer/Excel5/Xf.php rename to classes/src/Writer/Excel5/Xf.php diff --git a/classes1/src/Writer/Exception.php b/classes/src/Writer/Exception.php similarity index 100% rename from classes1/src/Writer/Exception.php rename to classes/src/Writer/Exception.php diff --git a/classes1/src/Writer/HTML.php b/classes/src/Writer/HTML.php similarity index 100% rename from classes1/src/Writer/HTML.php rename to classes/src/Writer/HTML.php diff --git a/classes1/src/Writer/IWriter.php b/classes/src/Writer/IWriter.php similarity index 100% rename from classes1/src/Writer/IWriter.php rename to classes/src/Writer/IWriter.php diff --git a/classes1/src/Writer/OpenDocument.php b/classes/src/Writer/OpenDocument.php similarity index 100% rename from classes1/src/Writer/OpenDocument.php rename to classes/src/Writer/OpenDocument.php diff --git a/classes1/src/Writer/OpenDocument/Cell/Comment.php b/classes/src/Writer/OpenDocument/Cell/Comment.php similarity index 100% rename from classes1/src/Writer/OpenDocument/Cell/Comment.php rename to classes/src/Writer/OpenDocument/Cell/Comment.php diff --git a/classes1/src/Writer/OpenDocument/Content.php b/classes/src/Writer/OpenDocument/Content.php similarity index 100% rename from classes1/src/Writer/OpenDocument/Content.php rename to classes/src/Writer/OpenDocument/Content.php diff --git a/classes1/src/Writer/OpenDocument/Meta.php b/classes/src/Writer/OpenDocument/Meta.php similarity index 100% rename from classes1/src/Writer/OpenDocument/Meta.php rename to classes/src/Writer/OpenDocument/Meta.php diff --git a/classes1/src/Writer/OpenDocument/MetaInf.php b/classes/src/Writer/OpenDocument/MetaInf.php similarity index 100% rename from classes1/src/Writer/OpenDocument/MetaInf.php rename to classes/src/Writer/OpenDocument/MetaInf.php diff --git a/classes1/src/Writer/OpenDocument/Mimetype.php b/classes/src/Writer/OpenDocument/Mimetype.php similarity index 100% rename from classes1/src/Writer/OpenDocument/Mimetype.php rename to classes/src/Writer/OpenDocument/Mimetype.php diff --git a/classes1/src/Writer/OpenDocument/Settings.php b/classes/src/Writer/OpenDocument/Settings.php similarity index 100% rename from classes1/src/Writer/OpenDocument/Settings.php rename to classes/src/Writer/OpenDocument/Settings.php diff --git a/classes1/src/Writer/OpenDocument/Styles.php b/classes/src/Writer/OpenDocument/Styles.php similarity index 100% rename from classes1/src/Writer/OpenDocument/Styles.php rename to classes/src/Writer/OpenDocument/Styles.php diff --git a/classes1/src/Writer/OpenDocument/Thumbnails.php b/classes/src/Writer/OpenDocument/Thumbnails.php similarity index 100% rename from classes1/src/Writer/OpenDocument/Thumbnails.php rename to classes/src/Writer/OpenDocument/Thumbnails.php diff --git a/classes1/src/Writer/OpenDocument/WriterPart.php b/classes/src/Writer/OpenDocument/WriterPart.php similarity index 100% rename from classes1/src/Writer/OpenDocument/WriterPart.php rename to classes/src/Writer/OpenDocument/WriterPart.php diff --git a/classes1/src/Writer/PDF.php b/classes/src/Writer/PDF.php similarity index 100% rename from classes1/src/Writer/PDF.php rename to classes/src/Writer/PDF.php diff --git a/classes1/src/Writer/PDF/Core.php b/classes/src/Writer/PDF/Core.php similarity index 100% rename from classes1/src/Writer/PDF/Core.php rename to classes/src/Writer/PDF/Core.php diff --git a/classes1/src/Writer/PDF/DomPDF.php b/classes/src/Writer/PDF/DomPDF.php similarity index 100% rename from classes1/src/Writer/PDF/DomPDF.php rename to classes/src/Writer/PDF/DomPDF.php diff --git a/classes1/src/Writer/PDF/mPDF.php b/classes/src/Writer/PDF/mPDF.php similarity index 100% rename from classes1/src/Writer/PDF/mPDF.php rename to classes/src/Writer/PDF/mPDF.php diff --git a/classes1/src/Writer/PDF/tcPDF.php b/classes/src/Writer/PDF/tcPDF.php similarity index 100% rename from classes1/src/Writer/PDF/tcPDF.php rename to classes/src/Writer/PDF/tcPDF.php diff --git a/classes1/src/locale/bg/config b/classes/src/locale/bg/config similarity index 100% rename from classes1/src/locale/bg/config rename to classes/src/locale/bg/config diff --git a/classes1/src/locale/cs/config b/classes/src/locale/cs/config similarity index 100% rename from classes1/src/locale/cs/config rename to classes/src/locale/cs/config diff --git a/classes1/src/locale/cs/functions b/classes/src/locale/cs/functions similarity index 100% rename from classes1/src/locale/cs/functions rename to classes/src/locale/cs/functions diff --git a/classes1/src/locale/da/config b/classes/src/locale/da/config similarity index 100% rename from classes1/src/locale/da/config rename to classes/src/locale/da/config diff --git a/classes1/src/locale/da/functions b/classes/src/locale/da/functions similarity index 100% rename from classes1/src/locale/da/functions rename to classes/src/locale/da/functions diff --git a/classes1/src/locale/de/config b/classes/src/locale/de/config similarity index 100% rename from classes1/src/locale/de/config rename to classes/src/locale/de/config diff --git a/classes1/src/locale/de/functions b/classes/src/locale/de/functions similarity index 100% rename from classes1/src/locale/de/functions rename to classes/src/locale/de/functions diff --git a/classes1/src/locale/en/uk/config b/classes/src/locale/en/uk/config similarity index 100% rename from classes1/src/locale/en/uk/config rename to classes/src/locale/en/uk/config diff --git a/classes1/src/locale/es/config b/classes/src/locale/es/config similarity index 100% rename from classes1/src/locale/es/config rename to classes/src/locale/es/config diff --git a/classes1/src/locale/es/functions b/classes/src/locale/es/functions similarity index 100% rename from classes1/src/locale/es/functions rename to classes/src/locale/es/functions diff --git a/classes1/src/locale/fi/config b/classes/src/locale/fi/config similarity index 100% rename from classes1/src/locale/fi/config rename to classes/src/locale/fi/config diff --git a/classes1/src/locale/fi/functions b/classes/src/locale/fi/functions similarity index 100% rename from classes1/src/locale/fi/functions rename to classes/src/locale/fi/functions diff --git a/classes1/src/locale/fr/config b/classes/src/locale/fr/config similarity index 100% rename from classes1/src/locale/fr/config rename to classes/src/locale/fr/config diff --git a/classes1/src/locale/fr/functions b/classes/src/locale/fr/functions similarity index 100% rename from classes1/src/locale/fr/functions rename to classes/src/locale/fr/functions diff --git a/classes1/src/locale/hu/config b/classes/src/locale/hu/config similarity index 100% rename from classes1/src/locale/hu/config rename to classes/src/locale/hu/config diff --git a/classes1/src/locale/hu/functions b/classes/src/locale/hu/functions similarity index 100% rename from classes1/src/locale/hu/functions rename to classes/src/locale/hu/functions diff --git a/classes1/src/locale/it/config b/classes/src/locale/it/config similarity index 100% rename from classes1/src/locale/it/config rename to classes/src/locale/it/config diff --git a/classes1/src/locale/it/functions b/classes/src/locale/it/functions similarity index 100% rename from classes1/src/locale/it/functions rename to classes/src/locale/it/functions diff --git a/classes1/src/locale/nl/config b/classes/src/locale/nl/config similarity index 100% rename from classes1/src/locale/nl/config rename to classes/src/locale/nl/config diff --git a/classes1/src/locale/nl/functions b/classes/src/locale/nl/functions similarity index 100% rename from classes1/src/locale/nl/functions rename to classes/src/locale/nl/functions diff --git a/classes1/src/locale/no/config b/classes/src/locale/no/config similarity index 100% rename from classes1/src/locale/no/config rename to classes/src/locale/no/config diff --git a/classes1/src/locale/no/functions b/classes/src/locale/no/functions similarity index 100% rename from classes1/src/locale/no/functions rename to classes/src/locale/no/functions diff --git a/classes1/src/locale/pl/config b/classes/src/locale/pl/config similarity index 100% rename from classes1/src/locale/pl/config rename to classes/src/locale/pl/config diff --git a/classes1/src/locale/pl/functions b/classes/src/locale/pl/functions similarity index 100% rename from classes1/src/locale/pl/functions rename to classes/src/locale/pl/functions diff --git a/classes1/src/locale/pt/br/config b/classes/src/locale/pt/br/config similarity index 100% rename from classes1/src/locale/pt/br/config rename to classes/src/locale/pt/br/config diff --git a/classes1/src/locale/pt/br/functions b/classes/src/locale/pt/br/functions similarity index 100% rename from classes1/src/locale/pt/br/functions rename to classes/src/locale/pt/br/functions diff --git a/classes1/src/locale/pt/config b/classes/src/locale/pt/config similarity index 100% rename from classes1/src/locale/pt/config rename to classes/src/locale/pt/config diff --git a/classes1/src/locale/pt/functions b/classes/src/locale/pt/functions similarity index 100% rename from classes1/src/locale/pt/functions rename to classes/src/locale/pt/functions diff --git a/classes1/src/locale/ru/config b/classes/src/locale/ru/config similarity index 100% rename from classes1/src/locale/ru/config rename to classes/src/locale/ru/config diff --git a/classes1/src/locale/ru/functions b/classes/src/locale/ru/functions similarity index 100% rename from classes1/src/locale/ru/functions rename to classes/src/locale/ru/functions diff --git a/classes1/src/locale/sv/config b/classes/src/locale/sv/config similarity index 100% rename from classes1/src/locale/sv/config rename to classes/src/locale/sv/config diff --git a/classes1/src/locale/sv/functions b/classes/src/locale/sv/functions similarity index 100% rename from classes1/src/locale/sv/functions rename to classes/src/locale/sv/functions diff --git a/classes1/src/locale/tr/config b/classes/src/locale/tr/config similarity index 100% rename from classes1/src/locale/tr/config rename to classes/src/locale/tr/config diff --git a/classes1/src/locale/tr/functions b/classes/src/locale/tr/functions similarity index 100% rename from classes1/src/locale/tr/functions rename to classes/src/locale/tr/functions