diff --git a/src/Standards/Typo3Update/FeatureInterface.php b/src/Standards/Typo3Update/Feature/FeatureInterface.php
similarity index 97%
rename from src/Standards/Typo3Update/FeatureInterface.php
rename to src/Standards/Typo3Update/Feature/FeatureInterface.php
index ed73e55..36d63c7 100644
--- a/src/Standards/Typo3Update/FeatureInterface.php
+++ b/src/Standards/Typo3Update/Feature/FeatureInterface.php
@@ -1,5 +1,5 @@
 <?php
-namespace Typo3Update;
+namespace Typo3Update\Feature;
 
 /*
  * Copyright (C) 2017  Daniel Siepmann <coding@daniel-siepmann.de>
diff --git a/src/Standards/Typo3Update/Features.php b/src/Standards/Typo3Update/Feature/Features.php
similarity index 97%
rename from src/Standards/Typo3Update/Features.php
rename to src/Standards/Typo3Update/Feature/Features.php
index 1927ffc..996f012 100644
--- a/src/Standards/Typo3Update/Features.php
+++ b/src/Standards/Typo3Update/Feature/Features.php
@@ -1,5 +1,5 @@
 <?php
-namespace Typo3Update;
+namespace Typo3Update\Feature;
 
 /*
  * Copyright (C) 2017  Daniel Siepmann <coding@daniel-siepmann.de>
@@ -21,6 +21,7 @@ namespace Typo3Update;
  */
 
 use PHP_CodeSniffer_Sniff as PhpCsSniff;
+use Typo3Update\Options;
 
 /**
  *
diff --git a/src/Standards/Typo3Update/FeaturesSupport.php b/src/Standards/Typo3Update/Feature/FeaturesSupport.php
similarity index 96%
rename from src/Standards/Typo3Update/FeaturesSupport.php
rename to src/Standards/Typo3Update/Feature/FeaturesSupport.php
index 183f017..fa71785 100644
--- a/src/Standards/Typo3Update/FeaturesSupport.php
+++ b/src/Standards/Typo3Update/Feature/FeaturesSupport.php
@@ -1,5 +1,5 @@
 <?php
-namespace Typo3Update;
+namespace Typo3Update\Feature;
 
 /*
  * Copyright (C) 2017  Daniel Siepmann <coding@daniel-siepmann.de>
@@ -21,7 +21,6 @@ namespace Typo3Update;
  */
 
 use PHP_CodeSniffer_File as PhpCsFile;
-use Typo3Update\Features;
 
 /**
  * Provides "feature" support for sniff.
diff --git a/src/Standards/Typo3Update/Feature/LegacyClassnameFeature.php b/src/Standards/Typo3Update/Feature/LegacyClassnameFeature.php
index 70b5cf5..a052abf 100644
--- a/src/Standards/Typo3Update/Feature/LegacyClassnameFeature.php
+++ b/src/Standards/Typo3Update/Feature/LegacyClassnameFeature.php
@@ -23,8 +23,6 @@ namespace Typo3Update\Feature;
 use PHP_CodeSniffer as PhpCs;
 use PHP_CodeSniffer_File as PhpCsFile;
 use PHP_CodeSniffer_Sniff as PhpCsSniff;
-use Typo3Update\FeatureInterface;
-use Typo3Update\Feature\LegacyClassnameMapping;
 
 /**
  *
diff --git a/src/Standards/Typo3Update/Sniffs/Classname/AbstractClassnameChecker.php b/src/Standards/Typo3Update/Sniffs/Classname/AbstractClassnameChecker.php
index 7bc96b2..dbc60b2 100644
--- a/src/Standards/Typo3Update/Sniffs/Classname/AbstractClassnameChecker.php
+++ b/src/Standards/Typo3Update/Sniffs/Classname/AbstractClassnameChecker.php
@@ -22,7 +22,7 @@ namespace Typo3Update\Sniffs\Classname;
 
 use PHP_CodeSniffer_File as PhpCsFile;
 use PHP_CodeSniffer_Sniff as PhpCsSniff;
-use Typo3Update\FeaturesSupport;
+use Typo3Update\Feature\FeaturesSupport;
 
 /**
  * Provide common uses for all sniffs, regarding class name checks.
diff --git a/src/Standards/Typo3Update/Sniffs/Classname/PhpDocCommentSniff.php b/src/Standards/Typo3Update/Sniffs/Classname/PhpDocCommentSniff.php
index 80a9818..d1f7f78 100644
--- a/src/Standards/Typo3Update/Sniffs/Classname/PhpDocCommentSniff.php
+++ b/src/Standards/Typo3Update/Sniffs/Classname/PhpDocCommentSniff.php
@@ -21,7 +21,7 @@
 
 use PHP_CodeSniffer_File as PhpCsFile;
 use PHP_CodeSniffer_Sniff as PhpCsSniff;
-use Typo3Update\FeaturesSupport;
+use Typo3Update\Feature\FeaturesSupport;
 
 /**
  * Handle PHP Doc comments.