diff --git a/composer.json b/composer.json
index 91d7707..dc959f9 100644
--- a/composer.json
+++ b/composer.json
@@ -25,12 +25,12 @@
     },
     "autoload": {
         "psr-4": {
-            "Doctrine\\Inflector\\": "lib/Doctrine/Inflector"
+            "Doctrine\\Inflector\\": "src"
         }
     },
     "autoload-dev": {
         "psr-4": {
-            "Doctrine\\Tests\\Inflector\\": "tests/Doctrine/Tests/Inflector"
+            "Doctrine\\Tests\\Inflector\\": "tests"
         }
     },
     "config": {
diff --git a/phpcs.xml.dist b/phpcs.xml.dist
index f82a2ec..2f94990 100644
--- a/phpcs.xml.dist
+++ b/phpcs.xml.dist
@@ -11,7 +11,7 @@
 
     <config name="php_version" value="70200"/>
 
-    <file>lib</file>
+    <file>src</file>
     <file>tests</file>
 
     <rule ref="Doctrine" />
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
index 8fc66cb..7001180 100644
--- a/phpstan.neon.dist
+++ b/phpstan.neon.dist
@@ -6,5 +6,5 @@ includes:
 parameters:
     level: 7
     paths:
-      - lib
+      - src
       - tests
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index cfa53bd..9d0f4a2 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -10,13 +10,13 @@
 >
     <testsuites>
         <testsuite name="Doctrine Inflector Test Suite">
-            <directory>./tests/Doctrine/</directory>
+            <directory>tests</directory>
         </testsuite>
     </testsuites>
 
     <filter>
         <whitelist>
-            <directory>./lib/Doctrine/</directory>
+            <directory>src</directory>
         </whitelist>
     </filter>
 
diff --git a/psalm.xml b/psalm.xml
index 8c787d1..1dc898a 100644
--- a/psalm.xml
+++ b/psalm.xml
@@ -7,7 +7,7 @@
     xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
 >
     <projectFiles>
-        <directory name="lib" />
+        <directory name="src" />
         <directory name="tests" />
         <ignoreFiles>
             <directory name="vendor" />
diff --git a/lib/Doctrine/Inflector/CachedWordInflector.php b/src/CachedWordInflector.php
similarity index 100%
rename from lib/Doctrine/Inflector/CachedWordInflector.php
rename to src/CachedWordInflector.php
diff --git a/lib/Doctrine/Inflector/GenericLanguageInflectorFactory.php b/src/GenericLanguageInflectorFactory.php
similarity index 100%
rename from lib/Doctrine/Inflector/GenericLanguageInflectorFactory.php
rename to src/GenericLanguageInflectorFactory.php
diff --git a/lib/Doctrine/Inflector/Inflector.php b/src/Inflector.php
similarity index 100%
rename from lib/Doctrine/Inflector/Inflector.php
rename to src/Inflector.php
diff --git a/lib/Doctrine/Inflector/InflectorFactory.php b/src/InflectorFactory.php
similarity index 100%
rename from lib/Doctrine/Inflector/InflectorFactory.php
rename to src/InflectorFactory.php
diff --git a/lib/Doctrine/Inflector/Language.php b/src/Language.php
similarity index 100%
rename from lib/Doctrine/Inflector/Language.php
rename to src/Language.php
diff --git a/lib/Doctrine/Inflector/LanguageInflectorFactory.php b/src/LanguageInflectorFactory.php
similarity index 100%
rename from lib/Doctrine/Inflector/LanguageInflectorFactory.php
rename to src/LanguageInflectorFactory.php
diff --git a/lib/Doctrine/Inflector/NoopWordInflector.php b/src/NoopWordInflector.php
similarity index 100%
rename from lib/Doctrine/Inflector/NoopWordInflector.php
rename to src/NoopWordInflector.php
diff --git a/lib/Doctrine/Inflector/Rules/English/Inflectible.php b/src/Rules/English/Inflectible.php
similarity index 100%
rename from lib/Doctrine/Inflector/Rules/English/Inflectible.php
rename to src/Rules/English/Inflectible.php
diff --git a/lib/Doctrine/Inflector/Rules/English/InflectorFactory.php b/src/Rules/English/InflectorFactory.php
similarity index 100%
rename from lib/Doctrine/Inflector/Rules/English/InflectorFactory.php
rename to src/Rules/English/InflectorFactory.php
diff --git a/lib/Doctrine/Inflector/Rules/English/Rules.php b/src/Rules/English/Rules.php
similarity index 100%
rename from lib/Doctrine/Inflector/Rules/English/Rules.php
rename to src/Rules/English/Rules.php
diff --git a/lib/Doctrine/Inflector/Rules/English/Uninflected.php b/src/Rules/English/Uninflected.php
similarity index 100%
rename from lib/Doctrine/Inflector/Rules/English/Uninflected.php
rename to src/Rules/English/Uninflected.php
diff --git a/lib/Doctrine/Inflector/Rules/French/Inflectible.php b/src/Rules/French/Inflectible.php
similarity index 100%
rename from lib/Doctrine/Inflector/Rules/French/Inflectible.php
rename to src/Rules/French/Inflectible.php
diff --git a/lib/Doctrine/Inflector/Rules/French/InflectorFactory.php b/src/Rules/French/InflectorFactory.php
similarity index 100%
rename from lib/Doctrine/Inflector/Rules/French/InflectorFactory.php
rename to src/Rules/French/InflectorFactory.php
diff --git a/lib/Doctrine/Inflector/Rules/French/Rules.php b/src/Rules/French/Rules.php
similarity index 100%
rename from lib/Doctrine/Inflector/Rules/French/Rules.php
rename to src/Rules/French/Rules.php
diff --git a/lib/Doctrine/Inflector/Rules/French/Uninflected.php b/src/Rules/French/Uninflected.php
similarity index 100%
rename from lib/Doctrine/Inflector/Rules/French/Uninflected.php
rename to src/Rules/French/Uninflected.php
diff --git a/lib/Doctrine/Inflector/Rules/NorwegianBokmal/Inflectible.php b/src/Rules/NorwegianBokmal/Inflectible.php
similarity index 100%
rename from lib/Doctrine/Inflector/Rules/NorwegianBokmal/Inflectible.php
rename to src/Rules/NorwegianBokmal/Inflectible.php
diff --git a/lib/Doctrine/Inflector/Rules/NorwegianBokmal/InflectorFactory.php b/src/Rules/NorwegianBokmal/InflectorFactory.php
similarity index 100%
rename from lib/Doctrine/Inflector/Rules/NorwegianBokmal/InflectorFactory.php
rename to src/Rules/NorwegianBokmal/InflectorFactory.php
diff --git a/lib/Doctrine/Inflector/Rules/NorwegianBokmal/Rules.php b/src/Rules/NorwegianBokmal/Rules.php
similarity index 100%
rename from lib/Doctrine/Inflector/Rules/NorwegianBokmal/Rules.php
rename to src/Rules/NorwegianBokmal/Rules.php
diff --git a/lib/Doctrine/Inflector/Rules/NorwegianBokmal/Uninflected.php b/src/Rules/NorwegianBokmal/Uninflected.php
similarity index 100%
rename from lib/Doctrine/Inflector/Rules/NorwegianBokmal/Uninflected.php
rename to src/Rules/NorwegianBokmal/Uninflected.php
diff --git a/lib/Doctrine/Inflector/Rules/Pattern.php b/src/Rules/Pattern.php
similarity index 100%
rename from lib/Doctrine/Inflector/Rules/Pattern.php
rename to src/Rules/Pattern.php
diff --git a/lib/Doctrine/Inflector/Rules/Patterns.php b/src/Rules/Patterns.php
similarity index 100%
rename from lib/Doctrine/Inflector/Rules/Patterns.php
rename to src/Rules/Patterns.php
diff --git a/lib/Doctrine/Inflector/Rules/Portuguese/Inflectible.php b/src/Rules/Portuguese/Inflectible.php
similarity index 100%
rename from lib/Doctrine/Inflector/Rules/Portuguese/Inflectible.php
rename to src/Rules/Portuguese/Inflectible.php
diff --git a/lib/Doctrine/Inflector/Rules/Portuguese/InflectorFactory.php b/src/Rules/Portuguese/InflectorFactory.php
similarity index 100%
rename from lib/Doctrine/Inflector/Rules/Portuguese/InflectorFactory.php
rename to src/Rules/Portuguese/InflectorFactory.php
diff --git a/lib/Doctrine/Inflector/Rules/Portuguese/Rules.php b/src/Rules/Portuguese/Rules.php
similarity index 100%
rename from lib/Doctrine/Inflector/Rules/Portuguese/Rules.php
rename to src/Rules/Portuguese/Rules.php
diff --git a/lib/Doctrine/Inflector/Rules/Portuguese/Uninflected.php b/src/Rules/Portuguese/Uninflected.php
similarity index 100%
rename from lib/Doctrine/Inflector/Rules/Portuguese/Uninflected.php
rename to src/Rules/Portuguese/Uninflected.php
diff --git a/lib/Doctrine/Inflector/Rules/Ruleset.php b/src/Rules/Ruleset.php
similarity index 100%
rename from lib/Doctrine/Inflector/Rules/Ruleset.php
rename to src/Rules/Ruleset.php
diff --git a/lib/Doctrine/Inflector/Rules/Spanish/Inflectible.php b/src/Rules/Spanish/Inflectible.php
similarity index 100%
rename from lib/Doctrine/Inflector/Rules/Spanish/Inflectible.php
rename to src/Rules/Spanish/Inflectible.php
diff --git a/lib/Doctrine/Inflector/Rules/Spanish/InflectorFactory.php b/src/Rules/Spanish/InflectorFactory.php
similarity index 100%
rename from lib/Doctrine/Inflector/Rules/Spanish/InflectorFactory.php
rename to src/Rules/Spanish/InflectorFactory.php
diff --git a/lib/Doctrine/Inflector/Rules/Spanish/Rules.php b/src/Rules/Spanish/Rules.php
similarity index 100%
rename from lib/Doctrine/Inflector/Rules/Spanish/Rules.php
rename to src/Rules/Spanish/Rules.php
diff --git a/lib/Doctrine/Inflector/Rules/Spanish/Uninflected.php b/src/Rules/Spanish/Uninflected.php
similarity index 100%
rename from lib/Doctrine/Inflector/Rules/Spanish/Uninflected.php
rename to src/Rules/Spanish/Uninflected.php
diff --git a/lib/Doctrine/Inflector/Rules/Substitution.php b/src/Rules/Substitution.php
similarity index 100%
rename from lib/Doctrine/Inflector/Rules/Substitution.php
rename to src/Rules/Substitution.php
diff --git a/lib/Doctrine/Inflector/Rules/Substitutions.php b/src/Rules/Substitutions.php
similarity index 100%
rename from lib/Doctrine/Inflector/Rules/Substitutions.php
rename to src/Rules/Substitutions.php
diff --git a/lib/Doctrine/Inflector/Rules/Transformation.php b/src/Rules/Transformation.php
similarity index 100%
rename from lib/Doctrine/Inflector/Rules/Transformation.php
rename to src/Rules/Transformation.php
diff --git a/lib/Doctrine/Inflector/Rules/Transformations.php b/src/Rules/Transformations.php
similarity index 100%
rename from lib/Doctrine/Inflector/Rules/Transformations.php
rename to src/Rules/Transformations.php
diff --git a/lib/Doctrine/Inflector/Rules/Turkish/Inflectible.php b/src/Rules/Turkish/Inflectible.php
similarity index 100%
rename from lib/Doctrine/Inflector/Rules/Turkish/Inflectible.php
rename to src/Rules/Turkish/Inflectible.php
diff --git a/lib/Doctrine/Inflector/Rules/Turkish/InflectorFactory.php b/src/Rules/Turkish/InflectorFactory.php
similarity index 100%
rename from lib/Doctrine/Inflector/Rules/Turkish/InflectorFactory.php
rename to src/Rules/Turkish/InflectorFactory.php
diff --git a/lib/Doctrine/Inflector/Rules/Turkish/Rules.php b/src/Rules/Turkish/Rules.php
similarity index 100%
rename from lib/Doctrine/Inflector/Rules/Turkish/Rules.php
rename to src/Rules/Turkish/Rules.php
diff --git a/lib/Doctrine/Inflector/Rules/Turkish/Uninflected.php b/src/Rules/Turkish/Uninflected.php
similarity index 100%
rename from lib/Doctrine/Inflector/Rules/Turkish/Uninflected.php
rename to src/Rules/Turkish/Uninflected.php
diff --git a/lib/Doctrine/Inflector/Rules/Word.php b/src/Rules/Word.php
similarity index 100%
rename from lib/Doctrine/Inflector/Rules/Word.php
rename to src/Rules/Word.php
diff --git a/lib/Doctrine/Inflector/RulesetInflector.php b/src/RulesetInflector.php
similarity index 100%
rename from lib/Doctrine/Inflector/RulesetInflector.php
rename to src/RulesetInflector.php
diff --git a/lib/Doctrine/Inflector/WordInflector.php b/src/WordInflector.php
similarity index 100%
rename from lib/Doctrine/Inflector/WordInflector.php
rename to src/WordInflector.php
diff --git a/tests/Doctrine/Tests/Inflector/CachedWordInflectorTest.php b/tests/CachedWordInflectorTest.php
similarity index 100%
rename from tests/Doctrine/Tests/Inflector/CachedWordInflectorTest.php
rename to tests/CachedWordInflectorTest.php
diff --git a/tests/Doctrine/Tests/Inflector/InflectorFactoryTest.php b/tests/InflectorFactoryTest.php
similarity index 100%
rename from tests/Doctrine/Tests/Inflector/InflectorFactoryTest.php
rename to tests/InflectorFactoryTest.php
diff --git a/tests/Doctrine/Tests/Inflector/InflectorFunctionalTest.php b/tests/InflectorFunctionalTest.php
similarity index 100%
rename from tests/Doctrine/Tests/Inflector/InflectorFunctionalTest.php
rename to tests/InflectorFunctionalTest.php
diff --git a/tests/Doctrine/Tests/Inflector/InflectorTest.php b/tests/InflectorTest.php
similarity index 100%
rename from tests/Doctrine/Tests/Inflector/InflectorTest.php
rename to tests/InflectorTest.php
diff --git a/tests/Doctrine/Tests/Inflector/NoopWordInflectorTest.php b/tests/NoopWordInflectorTest.php
similarity index 100%
rename from tests/Doctrine/Tests/Inflector/NoopWordInflectorTest.php
rename to tests/NoopWordInflectorTest.php
diff --git a/tests/Doctrine/Tests/Inflector/Rules/English/EnglishFunctionalTest.php b/tests/Rules/English/EnglishFunctionalTest.php
similarity index 100%
rename from tests/Doctrine/Tests/Inflector/Rules/English/EnglishFunctionalTest.php
rename to tests/Rules/English/EnglishFunctionalTest.php
diff --git a/tests/Doctrine/Tests/Inflector/Rules/French/FrenchFunctionalTest.php b/tests/Rules/French/FrenchFunctionalTest.php
similarity index 100%
rename from tests/Doctrine/Tests/Inflector/Rules/French/FrenchFunctionalTest.php
rename to tests/Rules/French/FrenchFunctionalTest.php
diff --git a/tests/Doctrine/Tests/Inflector/Rules/LanguageFunctionalTest.php b/tests/Rules/LanguageFunctionalTest.php
similarity index 100%
rename from tests/Doctrine/Tests/Inflector/Rules/LanguageFunctionalTest.php
rename to tests/Rules/LanguageFunctionalTest.php
diff --git a/tests/Doctrine/Tests/Inflector/Rules/NorwegianBokmal/NorwegianBokmalFunctionalTest.php b/tests/Rules/NorwegianBokmal/NorwegianBokmalFunctionalTest.php
similarity index 100%
rename from tests/Doctrine/Tests/Inflector/Rules/NorwegianBokmal/NorwegianBokmalFunctionalTest.php
rename to tests/Rules/NorwegianBokmal/NorwegianBokmalFunctionalTest.php
diff --git a/tests/Doctrine/Tests/Inflector/Rules/PatternTest.php b/tests/Rules/PatternTest.php
similarity index 100%
rename from tests/Doctrine/Tests/Inflector/Rules/PatternTest.php
rename to tests/Rules/PatternTest.php
diff --git a/tests/Doctrine/Tests/Inflector/Rules/PatternsTest.php b/tests/Rules/PatternsTest.php
similarity index 100%
rename from tests/Doctrine/Tests/Inflector/Rules/PatternsTest.php
rename to tests/Rules/PatternsTest.php
diff --git a/tests/Doctrine/Tests/Inflector/Rules/Portuguese/PortugueseFunctionalTest.php b/tests/Rules/Portuguese/PortugueseFunctionalTest.php
similarity index 100%
rename from tests/Doctrine/Tests/Inflector/Rules/Portuguese/PortugueseFunctionalTest.php
rename to tests/Rules/Portuguese/PortugueseFunctionalTest.php
diff --git a/tests/Doctrine/Tests/Inflector/Rules/RulesetTest.php b/tests/Rules/RulesetTest.php
similarity index 100%
rename from tests/Doctrine/Tests/Inflector/Rules/RulesetTest.php
rename to tests/Rules/RulesetTest.php
diff --git a/tests/Doctrine/Tests/Inflector/Rules/Spanish/SpanishFunctionalTest.php b/tests/Rules/Spanish/SpanishFunctionalTest.php
similarity index 100%
rename from tests/Doctrine/Tests/Inflector/Rules/Spanish/SpanishFunctionalTest.php
rename to tests/Rules/Spanish/SpanishFunctionalTest.php
diff --git a/tests/Doctrine/Tests/Inflector/Rules/SubstitutionTest.php b/tests/Rules/SubstitutionTest.php
similarity index 100%
rename from tests/Doctrine/Tests/Inflector/Rules/SubstitutionTest.php
rename to tests/Rules/SubstitutionTest.php
diff --git a/tests/Doctrine/Tests/Inflector/Rules/SubstitutionsTest.php b/tests/Rules/SubstitutionsTest.php
similarity index 100%
rename from tests/Doctrine/Tests/Inflector/Rules/SubstitutionsTest.php
rename to tests/Rules/SubstitutionsTest.php
diff --git a/tests/Doctrine/Tests/Inflector/Rules/TransformationTest.php b/tests/Rules/TransformationTest.php
similarity index 100%
rename from tests/Doctrine/Tests/Inflector/Rules/TransformationTest.php
rename to tests/Rules/TransformationTest.php
diff --git a/tests/Doctrine/Tests/Inflector/Rules/TransformationsTest.php b/tests/Rules/TransformationsTest.php
similarity index 100%
rename from tests/Doctrine/Tests/Inflector/Rules/TransformationsTest.php
rename to tests/Rules/TransformationsTest.php
diff --git a/tests/Doctrine/Tests/Inflector/Rules/Turkish/TurkishFunctionalTest.php b/tests/Rules/Turkish/TurkishFunctionalTest.php
similarity index 100%
rename from tests/Doctrine/Tests/Inflector/Rules/Turkish/TurkishFunctionalTest.php
rename to tests/Rules/Turkish/TurkishFunctionalTest.php
diff --git a/tests/Doctrine/Tests/Inflector/Rules/WordTest.php b/tests/Rules/WordTest.php
similarity index 100%
rename from tests/Doctrine/Tests/Inflector/Rules/WordTest.php
rename to tests/Rules/WordTest.php
diff --git a/tests/Doctrine/Tests/Inflector/RulesetInflectorTest.php b/tests/RulesetInflectorTest.php
similarity index 100%
rename from tests/Doctrine/Tests/Inflector/RulesetInflectorTest.php
rename to tests/RulesetInflectorTest.php