diff --git a/src/LostInTranslation.php b/src/LostInTranslation.php
index e42e1b6..22c5d37 100644
--- a/src/LostInTranslation.php
+++ b/src/LostInTranslation.php
@@ -2,6 +2,8 @@
 
 namespace CodingSocks\LostInTranslation;
 
+use CodingSocks\LostInTranslation\NodeFinder\BladeNowdocFinder;
+use CodingSocks\LostInTranslation\NodeFinder\TranslationFinder;
 use Illuminate\Support\Str;
 use Illuminate\View\Compilers\BladeCompiler;
 use Symfony\Component\Finder\SplFileInfo;
diff --git a/src/BladeNowdocFinder.php b/src/NodeFinder/BladeNowdocFinder.php
similarity index 95%
rename from src/BladeNowdocFinder.php
rename to src/NodeFinder/BladeNowdocFinder.php
index 835a389..36856ae 100644
--- a/src/BladeNowdocFinder.php
+++ b/src/NodeFinder/BladeNowdocFinder.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace CodingSocks\LostInTranslation;
+namespace CodingSocks\LostInTranslation\NodeFinder;
 
 use PhpParser\Node\Scalar\String_;
 use PhpParser\NodeTraverser;
diff --git a/src/TranslationFinder.php b/src/NodeFinder/TranslationFinder.php
similarity index 96%
rename from src/TranslationFinder.php
rename to src/NodeFinder/TranslationFinder.php
index c339251..7025007 100644
--- a/src/TranslationFinder.php
+++ b/src/NodeFinder/TranslationFinder.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace CodingSocks\LostInTranslation;
+namespace CodingSocks\LostInTranslation\NodeFinder;
 
 use PhpParser\NodeTraverser;
 use PhpParser\Parser;
diff --git a/src/TranslationFindingVisitor.php b/src/NodeFinder/TranslationFindingVisitor.php
similarity index 98%
rename from src/TranslationFindingVisitor.php
rename to src/NodeFinder/TranslationFindingVisitor.php
index bdb598d..ee0cb3d 100644
--- a/src/TranslationFindingVisitor.php
+++ b/src/NodeFinder/TranslationFindingVisitor.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace CodingSocks\LostInTranslation;
+namespace CodingSocks\LostInTranslation\NodeFinder;
 
 use PhpParser\Node;
 use PhpParser\Node\Expr\FuncCall;
diff --git a/tests/FirstArgumentResolverTest.php b/tests/FirstArgumentResolverTest.php
index a9db918..fa182a8 100644
--- a/tests/FirstArgumentResolverTest.php
+++ b/tests/FirstArgumentResolverTest.php
@@ -3,8 +3,8 @@
 namespace CodingSocks\LostInTranslation\Tests;
 
 use CodingSocks\LostInTranslation\FirstArgumentResolver;
+use CodingSocks\LostInTranslation\NodeFinder\TranslationFinder;
 use CodingSocks\LostInTranslation\NonStringArgumentException;
-use CodingSocks\LostInTranslation\TranslationFinder;
 
 class FirstArgumentResolverTest extends TestCase
 {
diff --git a/tests/LostInTranslationServiceProviderTest.php b/tests/LostInTranslationServiceProviderTest.php
index df67f36..84137aa 100644
--- a/tests/LostInTranslationServiceProviderTest.php
+++ b/tests/LostInTranslationServiceProviderTest.php
@@ -3,7 +3,6 @@
 namespace CodingSocks\LostInTranslation\Tests;
 
 use CodingSocks\LostInTranslation\LostInTranslation;
-use CodingSocks\LostInTranslation\TranslationFinder;
 
 class LostInTranslationServiceProviderTest extends TestCase
 {
diff --git a/tests/BladeNowdocFinderTest.php b/tests/NodeFinder/BladeNowdocFinderTest.php
similarity index 79%
rename from tests/BladeNowdocFinderTest.php
rename to tests/NodeFinder/BladeNowdocFinderTest.php
index 7a4ebe8..bd62e0d 100644
--- a/tests/BladeNowdocFinderTest.php
+++ b/tests/NodeFinder/BladeNowdocFinderTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace CodingSocks\LostInTranslation\Tests;
+namespace CodingSocks\LostInTranslation\Tests\NodeFinder;
 
-use CodingSocks\LostInTranslation\BladeNowdocFinder;
-use CodingSocks\LostInTranslation\TranslationFinder;
+use CodingSocks\LostInTranslation\NodeFinder\BladeNowdocFinder;
+use CodingSocks\LostInTranslation\Tests\TestCase;
 
 class BladeNowdocFinderTest extends TestCase
 {
diff --git a/tests/TranslationFinderTest.php b/tests/NodeFinder/TranslationFinderTest.php
similarity index 91%
rename from tests/TranslationFinderTest.php
rename to tests/NodeFinder/TranslationFinderTest.php
index 31e6632..c61efe5 100644
--- a/tests/TranslationFinderTest.php
+++ b/tests/NodeFinder/TranslationFinderTest.php
@@ -1,8 +1,9 @@
 <?php
 
-namespace CodingSocks\LostInTranslation\Tests;
+namespace CodingSocks\LostInTranslation\Tests\NodeFinder;
 
-use CodingSocks\LostInTranslation\TranslationFinder;
+use CodingSocks\LostInTranslation\NodeFinder\TranslationFinder;
+use CodingSocks\LostInTranslation\Tests\TestCase;
 
 class TranslationFinderTest extends TestCase
 {