diff --git a/config/services.yaml b/config/services.yaml
index 3d38207..b9f54d2 100644
--- a/config/services.yaml
+++ b/config/services.yaml
@@ -26,5 +26,5 @@ services:
     # add more service definitions when explicit configuration is needed
     # please note that last definitions always *replace* previous ones
     App\EventRepository:
-        class: App\MeetupEventRepository
+        class: App\Meetup\MeetupEventRepository
         public: true
diff --git a/src/MeetupEventRepository.php b/src/Meetup/MeetupEventRepository.php
similarity index 95%
rename from src/MeetupEventRepository.php
rename to src/Meetup/MeetupEventRepository.php
index dc4687b..a347867 100644
--- a/src/MeetupEventRepository.php
+++ b/src/Meetup/MeetupEventRepository.php
@@ -1,7 +1,8 @@
 <?php
 
-namespace App;
+namespace App\Meetup;
 
+use App\EventRepository;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
 use Tightenco\Collect\Support\Collection;
 
diff --git a/tests/MeetupEventRepositoryTest.php b/tests/Meetup/MeetupEventRepositoryTest.php
similarity index 85%
rename from tests/MeetupEventRepositoryTest.php
rename to tests/Meetup/MeetupEventRepositoryTest.php
index c8dbf58..0605988 100644
--- a/tests/MeetupEventRepositoryTest.php
+++ b/tests/Meetup/MeetupEventRepositoryTest.php
@@ -1,8 +1,9 @@
 <?php
 
-namespace App\Tests;
+namespace App\Tests\Meetup;
 
 use App\EventRepository;
+use App\Tests\EventRepositoryContractTest;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 
 /**