diff --git a/Classes/Ttree/ContentRepositoryImporter/Aspect/EventLogAspect.php b/Classes/Aspect/EventLogAspect.php
similarity index 92%
rename from Classes/Ttree/ContentRepositoryImporter/Aspect/EventLogAspect.php
rename to Classes/Aspect/EventLogAspect.php
index 4a72f62..4521d8b 100644
--- a/Classes/Ttree/ContentRepositoryImporter/Aspect/EventLogAspect.php
+++ b/Classes/Aspect/EventLogAspect.php
@@ -7,12 +7,12 @@
 
 use Ttree\ContentRepositoryImporter\Domain\Service\ImportService;
 use Ttree\ContentRepositoryImporter\Importer\ImporterInterface;
-use TYPO3\Flow\Annotations as Flow;
-use TYPO3\Flow\AOP\JoinPointInterface;
-use TYPO3\Flow\Log\SystemLoggerInterface;
-use TYPO3\Flow\Persistence\PersistenceManagerInterface;
-use TYPO3\Flow\Utility\Arrays;
-use TYPO3\TYPO3CR\Domain\Repository\NodeDataRepository;
+use Neos\Flow\Annotations as Flow;
+use Neos\Flow\Aop\JoinPointInterface;
+use Neos\Flow\Log\SystemLoggerInterface;
+use Neos\Flow\Persistence\PersistenceManagerInterface;
+use Neos\Utility\Arrays;
+use Neos\ContentRepository\Domain\Repository\NodeDataRepository;
 
 /**
  * Aspect to automatically handle EventLog in Importer object
diff --git a/Classes/Ttree/ContentRepositoryImporter/Command/ImportCommandController.php b/Classes/Command/ImportCommandController.php
similarity index 96%
rename from Classes/Ttree/ContentRepositoryImporter/Command/ImportCommandController.php
rename to Classes/Command/ImportCommandController.php
index 45bb6fa..5573943 100644
--- a/Classes/Ttree/ContentRepositoryImporter/Command/ImportCommandController.php
+++ b/Classes/Command/ImportCommandController.php
@@ -11,14 +11,14 @@
 use Ttree\ContentRepositoryImporter\Domain\Service\ImportService;
 use Ttree\ContentRepositoryImporter\Exception\ImportAlreadyExecutedException;
 use Ttree\ContentRepositoryImporter\Importer\AbstractImporter;
-use TYPO3\Flow\Annotations as Flow;
-use TYPO3\Flow\Cli\CommandController;
-use TYPO3\Flow\Core\Booting\Scripts;
-use TYPO3\Flow\Exception;
-use TYPO3\Flow\Log\SystemLoggerInterface;
-use TYPO3\Flow\Object\ObjectManagerInterface;
-use TYPO3\Flow\Utility\Arrays;
-use TYPO3\Neos\EventLog\Domain\Service\EventEmittingService;
+use Neos\Flow\Annotations as Flow;
+use Neos\Flow\Cli\CommandController;
+use Neos\Flow\Core\Booting\Scripts;
+use Neos\Flow\Exception;
+use Neos\Flow\Log\SystemLoggerInterface;
+use Neos\Flow\ObjectManagement\ObjectManagerInterface;
+use Neos\Utility\Arrays;
+use Neos\Neos\EventLog\Domain\Service\EventEmittingService;
 
 /**
  * Import Command Controller
@@ -40,7 +40,7 @@ class ImportCommandController extends CommandController
     protected $eventLogRepository;
 
     /**
-     * @Flow\InjectConfiguration(package="TYPO3.Flow")
+     * @Flow\InjectConfiguration(package="Neos.Flow")
      * @var array
      */
     protected $flowSettings;
@@ -273,7 +273,7 @@ public function flushEventLogCommand()
      *
      * @param array $presetSettings
      * @param string $preset
-     * @throws \TYPO3\Flow\Mvc\Exception\StopActionException
+     * @throws \Neos\Flow\Mvc\Exception\StopActionException
      */
     protected function checkForPartsSettingsOrQuit(array $presetSettings, $preset)
     {
diff --git a/Classes/Ttree/ContentRepositoryImporter/DataProvider/AbstractDataProvider.php b/Classes/DataProvider/AbstractDataProvider.php
similarity index 96%
rename from Classes/Ttree/ContentRepositoryImporter/DataProvider/AbstractDataProvider.php
rename to Classes/DataProvider/AbstractDataProvider.php
index cf69b3e..21642f1 100644
--- a/Classes/Ttree/ContentRepositoryImporter/DataProvider/AbstractDataProvider.php
+++ b/Classes/DataProvider/AbstractDataProvider.php
@@ -6,8 +6,8 @@
  */
 
 use Ttree\ContentRepositoryImporter\Service\ProcessedNodeService;
-use TYPO3\Flow\Annotations as Flow;
-use TYPO3\Flow\Log\SystemLoggerInterface;
+use Neos\Flow\Annotations as Flow;
+use Neos\Flow\Log\SystemLoggerInterface;
 
 /**
  * Abstract Data Provider
diff --git a/Classes/Ttree/ContentRepositoryImporter/DataProvider/AbstractDatabaseDataProvider.php b/Classes/DataProvider/AbstractDatabaseDataProvider.php
similarity index 97%
rename from Classes/Ttree/ContentRepositoryImporter/DataProvider/AbstractDatabaseDataProvider.php
rename to Classes/DataProvider/AbstractDatabaseDataProvider.php
index 65214b5..46df8be 100644
--- a/Classes/Ttree/ContentRepositoryImporter/DataProvider/AbstractDatabaseDataProvider.php
+++ b/Classes/DataProvider/AbstractDatabaseDataProvider.php
@@ -8,7 +8,7 @@
 use Doctrine\DBAL\Configuration;
 use Doctrine\DBAL\Connection;
 use Doctrine\DBAL\DriverManager;
-use TYPO3\Flow\Annotations as Flow;
+use Neos\Flow\Annotations as Flow;
 
 /**
  * Database based Data Provider
diff --git a/Classes/Ttree/ContentRepositoryImporter/DataProvider/CsvDataProvider.php b/Classes/DataProvider/CsvDataProvider.php
similarity index 97%
rename from Classes/Ttree/ContentRepositoryImporter/DataProvider/CsvDataProvider.php
rename to Classes/DataProvider/CsvDataProvider.php
index 1af7087..d0a7405 100644
--- a/Classes/Ttree/ContentRepositoryImporter/DataProvider/CsvDataProvider.php
+++ b/Classes/DataProvider/CsvDataProvider.php
@@ -7,8 +7,8 @@
 
 use Ttree\ContentRepositoryImporter\Exception\InvalidArgumentException;
 use Ttree\ContentRepositoryImporter\Service\ProcessedNodeService;
-use TYPO3\Flow\Annotations as Flow;
-use TYPO3\Flow\Log\SystemLoggerInterface;
+use Neos\Flow\Annotations as Flow;
+use Neos\Flow\Log\SystemLoggerInterface;
 
 /**
  * Csv Data Provider
diff --git a/Classes/Ttree/ContentRepositoryImporter/DataProvider/DataProviderInterface.php b/Classes/DataProvider/DataProviderInterface.php
similarity index 95%
rename from Classes/Ttree/ContentRepositoryImporter/DataProvider/DataProviderInterface.php
rename to Classes/DataProvider/DataProviderInterface.php
index d58efbb..6640cc0 100644
--- a/Classes/Ttree/ContentRepositoryImporter/DataProvider/DataProviderInterface.php
+++ b/Classes/DataProvider/DataProviderInterface.php
@@ -5,7 +5,7 @@
  * This script belongs to the Neos Flow package "Ttree.ContentRepositoryImporter".
  */
 
-use TYPO3\Flow\Annotations as Flow;
+use Neos\Flow\Annotations as Flow;
 
 /**
  * Data Provider Interface
diff --git a/Classes/Ttree/ContentRepositoryImporter/DataType/DataType.php b/Classes/DataType/DataType.php
similarity index 94%
rename from Classes/Ttree/ContentRepositoryImporter/DataType/DataType.php
rename to Classes/DataType/DataType.php
index 09335d5..7622d48 100644
--- a/Classes/Ttree/ContentRepositoryImporter/DataType/DataType.php
+++ b/Classes/DataType/DataType.php
@@ -5,8 +5,8 @@
  * This script belongs to the Neos Flow package "Ttree.ContentRepositoryImporter".
  */
 
-use TYPO3\Flow\Annotations as Flow;
-use TYPO3\Flow\Configuration\ConfigurationManager;
+use Neos\Flow\Annotations as Flow;
+use Neos\Flow\Configuration\ConfigurationManager;
 
 /**
  * String Data Type
diff --git a/Classes/Ttree/ContentRepositoryImporter/DataType/DataTypeInterface.php b/Classes/DataType/DataTypeInterface.php
similarity index 91%
rename from Classes/Ttree/ContentRepositoryImporter/DataType/DataTypeInterface.php
rename to Classes/DataType/DataTypeInterface.php
index 841d7f3..3b2d284 100644
--- a/Classes/Ttree/ContentRepositoryImporter/DataType/DataTypeInterface.php
+++ b/Classes/DataType/DataTypeInterface.php
@@ -5,7 +5,7 @@
  * This script belongs to the Neos Flow package "Ttree.ContentRepositoryImporter".
  */
 
-use TYPO3\Flow\Annotations as Flow;
+use Neos\Flow\Annotations as Flow;
 
 /**
  * Data Type Interface
diff --git a/Classes/Ttree/ContentRepositoryImporter/DataType/Date.php b/Classes/DataType/Date.php
similarity index 98%
rename from Classes/Ttree/ContentRepositoryImporter/DataType/Date.php
rename to Classes/DataType/Date.php
index 566fef3..73835fe 100644
--- a/Classes/Ttree/ContentRepositoryImporter/DataType/Date.php
+++ b/Classes/DataType/Date.php
@@ -5,7 +5,7 @@
  * This script belongs to the TYPO3 Flow package "Ttree.ContentRepositoryImporter". *
  *                                                                                  */
 
-use TYPO3\Flow\Annotations as Flow;
+use Neos\Flow\Annotations as Flow;
 
 /**
  * Date Data Type
diff --git a/Classes/Ttree/ContentRepositoryImporter/DataType/ExternalResource.php b/Classes/DataType/ExternalResource.php
similarity index 95%
rename from Classes/Ttree/ContentRepositoryImporter/DataType/ExternalResource.php
rename to Classes/DataType/ExternalResource.php
index 07167ec..8e56212 100644
--- a/Classes/Ttree/ContentRepositoryImporter/DataType/ExternalResource.php
+++ b/Classes/DataType/ExternalResource.php
@@ -6,12 +6,12 @@
  */
 
 use Gedmo\Uploadable\MimeType\MimeTypeGuesser;
-use TYPO3\Flow\Annotations as Flow;
-use TYPO3\Flow\Exception;
-use TYPO3\Flow\Log\SystemLoggerInterface;
-use TYPO3\Flow\Resource\ResourceManager;
-use TYPO3\Flow\Utility\Files;
-use TYPO3\Flow\Utility\MediaTypes;
+use Neos\Flow\Annotations as Flow;
+use Neos\Flow\Exception;
+use Neos\Flow\Log\SystemLoggerInterface;
+use Neos\Flow\ResourceManagement\ResourceManager;
+use Neos\Utility\Files;
+use Neos\Utility\MediaTypes;
 
 /**
  * String Data Type
@@ -62,8 +62,8 @@ public function disableForceDownload()
     /**
      * @param string $value
      * @throws Exception
-     * @throws \TYPO3\Flow\Resource\Exception
-     * @throws \TYPO3\Flow\Utility\Exception
+     * @throws \Neos\Flow\ResourceManagement\Exception
+     * @throws \Neos\Flow\Utility\Exception
      */
     protected function initializeValue($value)
     {
diff --git a/Classes/Ttree/ContentRepositoryImporter/DataType/HtmlContent.php b/Classes/DataType/HtmlContent.php
similarity index 97%
rename from Classes/Ttree/ContentRepositoryImporter/DataType/HtmlContent.php
rename to Classes/DataType/HtmlContent.php
index 180f96e..c495ac0 100644
--- a/Classes/Ttree/ContentRepositoryImporter/DataType/HtmlContent.php
+++ b/Classes/DataType/HtmlContent.php
@@ -5,8 +5,8 @@
  * This script belongs to the Neos Flow package "Ttree.ContentRepositoryImporter".
  */
 
-use TYPO3\Flow\Annotations as Flow;
-use TYPO3\Flow\Utility\Arrays;
+use Neos\Flow\Annotations as Flow;
+use Neos\Utility\Arrays;
 
 /**
  * String Data Type
diff --git a/Classes/Ttree/ContentRepositoryImporter/DataType/Integer.php b/Classes/DataType/Integer.php
similarity index 91%
rename from Classes/Ttree/ContentRepositoryImporter/DataType/Integer.php
rename to Classes/DataType/Integer.php
index 78d49e3..aabbda1 100644
--- a/Classes/Ttree/ContentRepositoryImporter/DataType/Integer.php
+++ b/Classes/DataType/Integer.php
@@ -5,7 +5,7 @@
  * This script belongs to the Neos Flow package "Ttree.ContentRepositoryImporter".
  */
 
-use TYPO3\Flow\Annotations as Flow;
+use Neos\Flow\Annotations as Flow;
 
 /**
  * String Data Type
diff --git a/Classes/Ttree/ContentRepositoryImporter/DataType/Slug.php b/Classes/DataType/Slug.php
similarity index 93%
rename from Classes/Ttree/ContentRepositoryImporter/DataType/Slug.php
rename to Classes/DataType/Slug.php
index acd31f2..537da68 100644
--- a/Classes/Ttree/ContentRepositoryImporter/DataType/Slug.php
+++ b/Classes/DataType/Slug.php
@@ -6,7 +6,7 @@
  */
 
 use Cocur\Slugify\Slugify;
-use TYPO3\Flow\Annotations as Flow;
+use Neos\Flow\Annotations as Flow;
 
 /**
  * String Data Type
diff --git a/Classes/Ttree/ContentRepositoryImporter/DataType/StringValue.php b/Classes/DataType/StringValue.php
similarity index 93%
rename from Classes/Ttree/ContentRepositoryImporter/DataType/StringValue.php
rename to Classes/DataType/StringValue.php
index 8403b4b..9dae9b6 100644
--- a/Classes/Ttree/ContentRepositoryImporter/DataType/StringValue.php
+++ b/Classes/DataType/StringValue.php
@@ -5,7 +5,7 @@
  * This script belongs to the Neos Flow package "Ttree.ContentRepositoryImporter".
  */
 
-use TYPO3\Flow\Annotations as Flow;
+use Neos\Flow\Annotations as Flow;
 
 /**
  * String Data Type
diff --git a/Classes/Ttree/ContentRepositoryImporter/Domain/Model/Event.php b/Classes/Domain/Model/Event.php
similarity index 88%
rename from Classes/Ttree/ContentRepositoryImporter/Domain/Model/Event.php
rename to Classes/Domain/Model/Event.php
index e6d090e..17c364b 100644
--- a/Classes/Ttree/ContentRepositoryImporter/Domain/Model/Event.php
+++ b/Classes/Domain/Model/Event.php
@@ -5,8 +5,8 @@
  * This script belongs to the Neos Flow package "Ttree.ContentRepositoryImporter".
  */
 
-use TYPO3\Flow\Annotations as Flow;
-use TYPO3\Neos\EventLog\Domain\Model\NodeEvent;
+use Neos\Flow\Annotations as Flow;
+use Neos\Neos\EventLog\Domain\Model\NodeEvent;
 
 /**
  * A specific event used by the ContentRepositoryImporter
diff --git a/Classes/Ttree/ContentRepositoryImporter/Domain/Model/Import.php b/Classes/Domain/Model/Import.php
similarity index 93%
rename from Classes/Ttree/ContentRepositoryImporter/Domain/Model/Import.php
rename to Classes/Domain/Model/Import.php
index 594a586..c3344a7 100644
--- a/Classes/Ttree/ContentRepositoryImporter/Domain/Model/Import.php
+++ b/Classes/Domain/Model/Import.php
@@ -6,11 +6,11 @@
  */
 
 use Doctrine\ORM\Mapping as ORM;
-use TYPO3\Flow\Annotations as Flow;
-use TYPO3\Flow\Exception;
-use TYPO3\Flow\Log\SystemLoggerInterface;
-use TYPO3\Flow\Object\ObjectManagerInterface;
-use TYPO3\Neos\EventLog\Domain\Service\EventEmittingService;
+use Neos\Flow\Annotations as Flow;
+use Neos\Flow\Exception;
+use Neos\Flow\Log\SystemLoggerInterface;
+use Neos\Flow\ObjectManagement\ObjectManagerInterface;
+use Neos\Neos\EventLog\Domain\Service\EventEmittingService;
 
 /**
  * @Flow\Entity
@@ -80,7 +80,7 @@ public function getExternalImportIdentifier()
      * @param array $data
      * @param Event $parentEvent
      * @return Event
-     * @throws \TYPO3\Neos\Exception
+     * @throws \Neos\Neos\Exception
      */
     public function addEvent($eventType, $externalIdentifier = null, array $data = null, Event $parentEvent = null)
     {
diff --git a/Classes/Ttree/ContentRepositoryImporter/Domain/Model/PresetPartDefinition.php b/Classes/Domain/Model/PresetPartDefinition.php
similarity index 99%
rename from Classes/Ttree/ContentRepositoryImporter/Domain/Model/PresetPartDefinition.php
rename to Classes/Domain/Model/PresetPartDefinition.php
index 8638196..9f31e23 100644
--- a/Classes/Ttree/ContentRepositoryImporter/Domain/Model/PresetPartDefinition.php
+++ b/Classes/Domain/Model/PresetPartDefinition.php
@@ -6,7 +6,7 @@
  */
 
 use Ttree\ContentRepositoryImporter\Exception\InvalidArgumentException;
-use TYPO3\Flow\Annotations as Flow;
+use Neos\Flow\Annotations as Flow;
 
 /**
  * Preset Part Definition
diff --git a/Classes/Ttree/ContentRepositoryImporter/Domain/Model/RecordMapping.php b/Classes/Domain/Model/RecordMapping.php
similarity index 99%
rename from Classes/Ttree/ContentRepositoryImporter/Domain/Model/RecordMapping.php
rename to Classes/Domain/Model/RecordMapping.php
index aedd367..375883e 100644
--- a/Classes/Ttree/ContentRepositoryImporter/Domain/Model/RecordMapping.php
+++ b/Classes/Domain/Model/RecordMapping.php
@@ -6,7 +6,7 @@
  */
 
 use Doctrine\ORM\Mapping as ORM;
-use TYPO3\Flow\Annotations as Flow;
+use Neos\Flow\Annotations as Flow;
 use Gedmo\Mapping\Annotation as Gedmo;
 
 /**
diff --git a/Classes/Ttree/ContentRepositoryImporter/Domain/Repository/EventRepository.php b/Classes/Domain/Repository/EventRepository.php
similarity index 85%
rename from Classes/Ttree/ContentRepositoryImporter/Domain/Repository/EventRepository.php
rename to Classes/Domain/Repository/EventRepository.php
index 7c52dba..309129c 100644
--- a/Classes/Ttree/ContentRepositoryImporter/Domain/Repository/EventRepository.php
+++ b/Classes/Domain/Repository/EventRepository.php
@@ -5,12 +5,12 @@
  * This script belongs to the Neos Flow package "Ttree.ContentRepositoryImporter".
  */
 
-use TYPO3\Flow\Annotations as Flow;
+use Neos\Flow\Annotations as Flow;
 
 /**
  * @Flow\Scope("singleton")
  */
-class EventRepository extends \TYPO3\Neos\EventLog\Domain\Repository\EventRepository
+class EventRepository extends \Neos\Neos\EventLog\Domain\Repository\EventRepository
 {
     /**
      * Remove all events without checking foreign keys. Needed for clearing the table during tests.
diff --git a/Classes/Ttree/ContentRepositoryImporter/Domain/Repository/ImportRepository.php b/Classes/Domain/Repository/ImportRepository.php
similarity index 92%
rename from Classes/Ttree/ContentRepositoryImporter/Domain/Repository/ImportRepository.php
rename to Classes/Domain/Repository/ImportRepository.php
index 719ef41..f5a4c44 100644
--- a/Classes/Ttree/ContentRepositoryImporter/Domain/Repository/ImportRepository.php
+++ b/Classes/Domain/Repository/ImportRepository.php
@@ -6,8 +6,8 @@
  */
 
 use Doctrine\Common\Persistence\ObjectManager;
-use TYPO3\Flow\Annotations as Flow;
-use TYPO3\Flow\Persistence\Repository;
+use Neos\Flow\Annotations as Flow;
+use Neos\Flow\Persistence\Repository;
 
 /**
  * @Flow\Scope("singleton")
diff --git a/Classes/Ttree/ContentRepositoryImporter/Domain/Repository/RecordMappingRepository.php b/Classes/Domain/Repository/RecordMappingRepository.php
similarity index 95%
rename from Classes/Ttree/ContentRepositoryImporter/Domain/Repository/RecordMappingRepository.php
rename to Classes/Domain/Repository/RecordMappingRepository.php
index 65dbfc7..d614aad 100644
--- a/Classes/Ttree/ContentRepositoryImporter/Domain/Repository/RecordMappingRepository.php
+++ b/Classes/Domain/Repository/RecordMappingRepository.php
@@ -7,8 +7,8 @@
 
 use Doctrine\Common\Persistence\ObjectManager;
 use Ttree\ContentRepositoryImporter\Domain\Model\RecordMapping;
-use TYPO3\Flow\Annotations as Flow;
-use TYPO3\Flow\Persistence\Repository;
+use Neos\Flow\Annotations as Flow;
+use Neos\Flow\Persistence\Repository;
 
 /**
  * @Flow\Scope("singleton")
diff --git a/Classes/Ttree/ContentRepositoryImporter/Domain/Service/ImportService.php b/Classes/Domain/Service/ImportService.php
similarity index 97%
rename from Classes/Ttree/ContentRepositoryImporter/Domain/Service/ImportService.php
rename to Classes/Domain/Service/ImportService.php
index b58f978..360c4be 100644
--- a/Classes/Ttree/ContentRepositoryImporter/Domain/Service/ImportService.php
+++ b/Classes/Domain/Service/ImportService.php
@@ -12,9 +12,9 @@
 use Ttree\ContentRepositoryImporter\Domain\Repository\ImportRepository;
 use Ttree\ContentRepositoryImporter\Domain\Repository\RecordMappingRepository;
 use Ttree\ContentRepositoryImporter\Exception\ImportAlreadyExecutedException;
-use TYPO3\Flow\Annotations as Flow;
-use TYPO3\Flow\Exception;
-use TYPO3\Flow\Persistence\PersistenceManagerInterface;
+use Neos\Flow\Annotations as Flow;
+use Neos\Flow\Exception;
+use Neos\Flow\Persistence\PersistenceManagerInterface;
 
 /**
  * @Flow\Scope("singleton")
@@ -67,7 +67,7 @@ public function resume($identifier)
      * @param string $externalImportIdentifier
      * @param boolean $force
      * @throws Exception
-     * @throws \TYPO3\Flow\Persistence\Exception\IllegalObjectTypeException
+     * @throws \Neos\Flow\Persistence\Exception\IllegalObjectTypeException
      */
     public function start($externalImportIdentifier = null, $force = false)
     {
diff --git a/Classes/Ttree/ContentRepositoryImporter/Exception/ImportAlreadyExecutedException.php b/Classes/Exception/ImportAlreadyExecutedException.php
similarity index 80%
rename from Classes/Ttree/ContentRepositoryImporter/Exception/ImportAlreadyExecutedException.php
rename to Classes/Exception/ImportAlreadyExecutedException.php
index 910b84b..bd8182a 100644
--- a/Classes/Ttree/ContentRepositoryImporter/Exception/ImportAlreadyExecutedException.php
+++ b/Classes/Exception/ImportAlreadyExecutedException.php
@@ -5,8 +5,8 @@
  * This script belongs to the Neos Flow package "Ttree.ContentRepositoryImporter".
  */
 
-use TYPO3\Flow\Annotations as Flow;
-use TYPO3\Flow\Exception;
+use Neos\Flow\Annotations as Flow;
+use Neos\Flow\Exception;
 
 /**
  * Import Already Executed Exception
diff --git a/Classes/Ttree/ContentRepositoryImporter/Exception/InvalidArgumentException.php b/Classes/Exception/InvalidArgumentException.php
similarity index 79%
rename from Classes/Ttree/ContentRepositoryImporter/Exception/InvalidArgumentException.php
rename to Classes/Exception/InvalidArgumentException.php
index 625ebd1..2a31bfa 100644
--- a/Classes/Ttree/ContentRepositoryImporter/Exception/InvalidArgumentException.php
+++ b/Classes/Exception/InvalidArgumentException.php
@@ -5,8 +5,8 @@
  * This script belongs to the Neos Flow package "Ttree.ContentRepositoryImporter".
  */
 
-use TYPO3\Flow\Annotations as Flow;
-use TYPO3\Flow\Exception;
+use Neos\Flow\Annotations as Flow;
+use Neos\Flow\Exception;
 
 /**
  * Invalid Argument Exception
diff --git a/Classes/Ttree/ContentRepositoryImporter/Importer/AbstractCommandBasedImporter.php b/Classes/Importer/AbstractCommandBasedImporter.php
similarity index 95%
rename from Classes/Ttree/ContentRepositoryImporter/Importer/AbstractCommandBasedImporter.php
rename to Classes/Importer/AbstractCommandBasedImporter.php
index 7fee090..9852b71 100644
--- a/Classes/Ttree/ContentRepositoryImporter/Importer/AbstractCommandBasedImporter.php
+++ b/Classes/Importer/AbstractCommandBasedImporter.php
@@ -6,8 +6,8 @@
  */
 
 use Ttree\ContentRepositoryImporter\DataType\Slug;
-use TYPO3\Flow\Annotations as Flow;
-use TYPO3\TYPO3CR\Domain\Model\NodeTemplate;
+use Neos\Flow\Annotations as Flow;
+use Neos\ContentRepository\Domain\Model\NodeTemplate;
 
 /**
  * A base importer for data providers which deliver data as commands (create, delete, update, ...) instead of plain
diff --git a/Classes/Ttree/ContentRepositoryImporter/Importer/AbstractImporter.php b/Classes/Importer/AbstractImporter.php
similarity index 96%
rename from Classes/Ttree/ContentRepositoryImporter/Importer/AbstractImporter.php
rename to Classes/Importer/AbstractImporter.php
index 7f5b489..9b2d0fe 100644
--- a/Classes/Ttree/ContentRepositoryImporter/Importer/AbstractImporter.php
+++ b/Classes/Importer/AbstractImporter.php
@@ -11,16 +11,16 @@
 use Ttree\ContentRepositoryImporter\Domain\Model\RecordMapping;
 use Ttree\ContentRepositoryImporter\Domain\Service\ImportService;
 use Ttree\ContentRepositoryImporter\Service\ProcessedNodeService;
-use TYPO3\Flow\Annotations as Flow;
-use TYPO3\Flow\Exception;
-use TYPO3\Flow\Log\SystemLoggerInterface;
-use TYPO3\Flow\Utility\Arrays;
-use TYPO3\TYPO3CR\Domain\Model\NodeInterface;
-use TYPO3\TYPO3CR\Domain\Model\NodeTemplate;
-use TYPO3\TYPO3CR\Domain\Model\NodeType;
-use TYPO3\TYPO3CR\Domain\Repository\NodeDataRepository;
-use TYPO3\TYPO3CR\Domain\Service\ContextFactoryInterface;
-use TYPO3\TYPO3CR\Domain\Service\NodeTypeManager;
+use Neos\Flow\Annotations as Flow;
+use Neos\Flow\Exception;
+use Neos\Flow\Log\SystemLoggerInterface;
+use Neos\Utility\Arrays;
+use Neos\ContentRepository\Domain\Model\NodeInterface;
+use Neos\ContentRepository\Domain\Model\NodeTemplate;
+use Neos\ContentRepository\Domain\Model\NodeType;
+use Neos\ContentRepository\Domain\Repository\NodeDataRepository;
+use Neos\ContentRepository\Domain\Service\ContextFactoryInterface;
+use Neos\ContentRepository\Domain\Service\NodeTypeManager;
 
 /**
  * Abstract Importer
@@ -48,7 +48,7 @@ abstract class AbstractImporter implements ImporterInterface
      *
      * @var string
      */
-    protected $storageNodeTypeName = 'TYPO3.Neos.NodeTypes:Page';
+    protected $storageNodeTypeName = 'Neos.NodeTypes:Page';
 
     /**
      * Key name for getExternalIdentifierFromRecordData() to determine the external identifier of a record
@@ -314,6 +314,7 @@ protected function processBatch(NodeTemplate $nodeTemplate = null)
             throw new Exception(sprintf('Expected records as an array while calling %s->fetch(), but returned %s instead.', get_class($this->dataProvider), gettype($records)), 1462960769826);
         }
         $records = $this->preProcessing($records);
+
         array_walk($records, function ($data) use ($nodeTemplate) {
             $this->processRecord($nodeTemplate, $data);
             ++$this->processedRecords;
@@ -369,7 +370,7 @@ public function processRecord(NodeTemplate $nodeTemplate, array $data)
 
     /**
      * @param NodeTemplate $nodeTemplate
-     * @throws \TYPO3\TYPO3CR\Exception\NodeException
+     * @throws \Neos\ContentRepository\Exception\NodeException
      */
     protected function unsetAllNodeTemplateProperties(NodeTemplate $nodeTemplate)
     {
@@ -553,7 +554,7 @@ protected function getLabelFromRecordData(array $data)
      * @param string $nodePath Absolute or relative (to the site node) node path of the storage node
      * @param string $title Title for the storage node document
      * @return void
-     * @throws \TYPO3\TYPO3CR\Exception\NodeTypeNotFoundException
+     * @throws \Neos\ContentRepository\Exception\NodeTypeNotFoundException
      */
     protected function initializeStorageNode($nodePath, $title)
     {
diff --git a/Classes/Ttree/ContentRepositoryImporter/Importer/ImporterInterface.php b/Classes/Importer/ImporterInterface.php
similarity index 93%
rename from Classes/Ttree/ContentRepositoryImporter/Importer/ImporterInterface.php
rename to Classes/Importer/ImporterInterface.php
index 0f5a5bf..62b6ad3 100644
--- a/Classes/Ttree/ContentRepositoryImporter/Importer/ImporterInterface.php
+++ b/Classes/Importer/ImporterInterface.php
@@ -8,8 +8,8 @@
 use Ttree\ContentRepositoryImporter\DataProvider\DataProviderInterface;
 use Ttree\ContentRepositoryImporter\Domain\Model\Event;
 use Ttree\ContentRepositoryImporter\Domain\Service\ImportService;
-use TYPO3\Flow\Annotations as Flow;
-use TYPO3\TYPO3CR\Domain\Model\NodeTemplate;
+use Neos\Flow\Annotations as Flow;
+use Neos\ContentRepository\Domain\Model\NodeTemplate;
 
 /**
  * Importer Interface
diff --git a/Classes/Ttree/ContentRepositoryImporter/Service/ProcessedNodeService.php b/Classes/Service/ProcessedNodeService.php
similarity index 97%
rename from Classes/Ttree/ContentRepositoryImporter/Service/ProcessedNodeService.php
rename to Classes/Service/ProcessedNodeService.php
index 06a1f72..86d1425 100644
--- a/Classes/Ttree/ContentRepositoryImporter/Service/ProcessedNodeService.php
+++ b/Classes/Service/ProcessedNodeService.php
@@ -8,7 +8,7 @@
 use Ttree\ContentRepositoryImporter\Domain\Model\RecordMapping;
 use Ttree\ContentRepositoryImporter\Domain\Repository\RecordMappingRepository;
 use Ttree\ContentRepositoryImporter\Domain\Service\ImportService;
-use TYPO3\Flow\Annotations as Flow;
+use Neos\Flow\Annotations as Flow;
 
 /**
  * Processed Node Service
diff --git a/Configuration/Objects.yaml b/Configuration/Objects.yaml
index 6c0ff6b..4d5c14b 100644
--- a/Configuration/Objects.yaml
+++ b/Configuration/Objects.yaml
@@ -2,7 +2,7 @@ Ttree\ContentRepositoryImporter\Service\ProcessedNodeService:
   properties:
     cache:
       object:
-        factoryObjectName: TYPO3\Flow\Cache\CacheManager
+        factoryObjectName: Neos\Flow\Cache\CacheManager
         factoryMethodName: getCache
         arguments:
           1:
@@ -12,7 +12,7 @@ Ttree\ContentRepositoryImporter\Command\ImportCommandController:
   properties:
     cache:
       object:
-        factoryObjectName: TYPO3\Flow\Cache\CacheManager
+        factoryObjectName: Neos\Flow\Cache\CacheManager
         factoryMethodName: getCache
         arguments:
           1:
@@ -22,7 +22,7 @@ Ttree\ContentRepositoryImporter\DataType\ExternalResource:
   properties:
     downloadCache:
       object:
-        factoryObjectName: TYPO3\Flow\Cache\CacheManager
+        factoryObjectName: Neos\Flow\Cache\CacheManager
         factoryMethodName: getCache
         arguments:
           1:
diff --git a/Migrations/Mysql/Version20150317235257.php b/Migrations/Mysql/Version20150317235257.php
index 23c4193..08db674 100644
--- a/Migrations/Mysql/Version20150317235257.php
+++ b/Migrations/Mysql/Version20150317235257.php
@@ -1,5 +1,5 @@
 <?php
-namespace TYPO3\Flow\Persistence\Doctrine\Migrations;
+namespace Neos\Flow\Persistence\Doctrine\Migrations;
 
 use Doctrine\DBAL\Migrations\AbstractMigration;
 use Doctrine\DBAL\Schema\Schema;
@@ -17,7 +17,7 @@ public function up(Schema $schema)
     {
         $this->abortIf($this->connection->getDatabasePlatform()->getName() != "mysql");
         
-        $this->addSql("ALTER TABLE typo3_neos_eventlog_domain_model_event ADD externalidentifier VARCHAR(255) DEFAULT NULL");
+        $this->addSql("ALTER TABLE neos_neos_eventlog_domain_model_event ADD externalidentifier VARCHAR(255) DEFAULT NULL");
         $this->addSql("CREATE TABLE ttree_contentrepositoryimporter_domain_model_import (persistence_object_identifier VARCHAR(40) NOT NULL, start DATETIME NOT NULL, end DATETIME DEFAULT NULL, PRIMARY KEY(persistence_object_identifier))");
     }
 
@@ -29,7 +29,7 @@ public function down(Schema $schema)
     {
         $this->abortIf($this->connection->getDatabasePlatform()->getName() != "mysql");
 
-        $this->addSql("ALTER TABLE typo3_neos_eventlog_domain_model_event DROP externalidentifier");
+        $this->addSql("ALTER TABLE neos_neos_eventlog_domain_model_event DROP externalidentifier");
         $this->addSql("DROP TABLE ttree_contentrepositoryimporter_domain_model_import");
     }
 }
diff --git a/Migrations/Mysql/Version20150319132414.php b/Migrations/Mysql/Version20150319132414.php
index 5639bf9..64cb2c8 100644
--- a/Migrations/Mysql/Version20150319132414.php
+++ b/Migrations/Mysql/Version20150319132414.php
@@ -1,5 +1,5 @@
 <?php
-namespace TYPO3\Flow\Persistence\Doctrine\Migrations;
+namespace Neos\Flow\Persistence\Doctrine\Migrations;
 
 use Doctrine\DBAL\Migrations\AbstractMigration;
 use Doctrine\DBAL\Schema\Schema;
diff --git a/Migrations/Mysql/Version20160523202439.php b/Migrations/Mysql/Version20160523202439.php
index c4f37e4..6f62775 100644
--- a/Migrations/Mysql/Version20160523202439.php
+++ b/Migrations/Mysql/Version20160523202439.php
@@ -1,5 +1,5 @@
 <?php
-namespace TYPO3\Flow\Persistence\Doctrine\Migrations;
+namespace Neos\Flow\Persistence\Doctrine\Migrations;
 
 use Doctrine\DBAL\Migrations\AbstractMigration;
 use Doctrine\DBAL\Schema\Schema;
diff --git a/composer.json b/composer.json
index b85686b..56f87b8 100644
--- a/composer.json
+++ b/composer.json
@@ -1,16 +1,91 @@
 {
     "name": "ttree/contentrepositoryimporter",
-    "type": "typo3-flow-package",
-    "description": "Helper package to import data in the TYPO3CR",
+    "type": "neos-package",
+    "description": "Helper package to import data in the Neos content repository",
     "require": {
-        "typo3/flow": "*",
+        "neos/flow": ">3.0",
         "ezyang/htmlpurifier": "*",
         "cocur/slugify": "*",
         "typo3/neos": "*"
     },
     "autoload": {
-        "psr-0": {
-            "Ttree\\ContentRepositoryImporter": "Classes"
+        "psr-4": {
+            "Ttree\\ContentRepositoryImporter\\": "Classes"
         }
+    },
+    "extra": {
+        "applied-flow-migrations": [
+            "TYPO3.FLOW3-201201261636",
+            "TYPO3.Fluid-201205031303",
+            "TYPO3.FLOW3-201205292145",
+            "TYPO3.FLOW3-201206271128",
+            "TYPO3.FLOW3-201209201112",
+            "TYPO3.Flow-201209251426",
+            "TYPO3.Flow-201211151101",
+            "TYPO3.Flow-201212051340",
+            "TYPO3.TypoScript-130516234520",
+            "TYPO3.TypoScript-130516235550",
+            "TYPO3.TYPO3CR-130523180140",
+            "TYPO3.Neos.NodeTypes-201309111655",
+            "TYPO3.Flow-201310031523",
+            "TYPO3.Flow-201405111147",
+            "TYPO3.Neos-201407061038",
+            "TYPO3.Neos-201409071922",
+            "TYPO3.TYPO3CR-140911160326",
+            "TYPO3.Neos-201410010000",
+            "TYPO3.TYPO3CR-141101082142",
+            "TYPO3.Neos-20141113115300",
+            "TYPO3.Fluid-20141113120800",
+            "TYPO3.Flow-20141113121400",
+            "TYPO3.Fluid-20141121091700",
+            "TYPO3.Neos-20141218134700",
+            "TYPO3.Fluid-20150214130800",
+            "TYPO3.Neos-20150303231600",
+            "TYPO3.TYPO3CR-20150510103823",
+            "TYPO3.Flow-20151113161300",
+            "TYPO3.Form-20160601101500",
+            "TYPO3.Flow-20161115140400",
+            "TYPO3.Flow-20161115140430",
+            "Neos.Flow-20161124204700",
+            "Neos.Flow-20161124204701",
+            "Neos.Twitter.Bootstrap-20161124204912",
+            "Neos.Form-20161124205254",
+            "Neos.Flow-20161124224015",
+            "Neos.Party-20161124225257",
+            "Neos.Eel-20161124230101",
+            "Neos.Kickstart-20161124230102",
+            "Neos.Setup-20161124230842",
+            "Neos.Imagine-20161124231742",
+            "Neos.Media-20161124233100",
+            "Neos.NodeTypes-20161125002300",
+            "Neos.SiteKickstarter-20161125002311",
+            "Neos.Neos-20161125002322",
+            "Neos.ContentRepository-20161125012000",
+            "Neos.Fusion-20161125013710",
+            "Neos.Setup-20161125014759",
+            "Neos.SiteKickstarter-20161125095901",
+            "Neos.Fusion-20161125104701",
+            "Neos.NodeTypes-20161125104800",
+            "Neos.Neos-20161125104802",
+            "Neos.Kickstarter-20161125110814",
+            "Neos.Neos-20161125122412",
+            "Neos.Flow-20161125124112",
+            "TYPO3.FluidAdaptor-20161130112935",
+            "Neos.Fusion-20161201202543",
+            "Neos.Neos-20161201222211",
+            "Neos.Fusion-20161202215034",
+            "Neos.Fusion-20161219092345",
+            "Neos.ContentRepository-20161219093512",
+            "Neos.Media-20161219094126",
+            "Neos.Neos-20161219094403",
+            "Neos.Neos-20161219122512",
+            "Neos.Fusion-20161219130100",
+            "Neos.Neos-20161220163741",
+            "Neos.Neos-20170115114620",
+            "Neos.Fusion-20170120013047",
+            "Neos.Flow-20170125103800",
+            "Neos.Seo-20170127154600",
+            "Neos.Flow-20170127183102"
+        ]
     }
 }