diff --git a/app/config/service/loader.yml b/app/config/service/loader.yml
index b872d69..e0c1e0a 100644
--- a/app/config/service/loader.yml
+++ b/app/config/service/loader.yml
@@ -9,10 +9,9 @@ services:
         class: AppBundle\Service\LDViewService
         arguments: ['%ldview_bin%', '@oneup_flysystem.media_filesystem']
 
-    loader.rebrickable:
-        class: AppBundle\Loader\RebrickableLoader
-        calls:
-          - [setArguments, ['@manager.rebrickable', '%rebrickable_url%']]
+    service.loader.rebrickable:
+        class: AppBundle\Service\Loader\RebrickableLoaderService
+        arguments: ['%rebrickable_url%']
         parent: service.loader
 
     util.dat.parser:
diff --git a/src/AppBundle/Loader/RebrickableLoader.php b/src/AppBundle/Service/Loader/RebrickableLoaderService.php
similarity index 96%
rename from src/AppBundle/Loader/RebrickableLoader.php
rename to src/AppBundle/Service/Loader/RebrickableLoaderService.php
index bc59022..bfbcb2e 100644
--- a/src/AppBundle/Loader/RebrickableLoader.php
+++ b/src/AppBundle/Service/Loader/RebrickableLoaderService.php
@@ -1,18 +1,18 @@
 <?php
 
-namespace AppBundle\Loader;
+namespace AppBundle\Service\Loader;
 
 use AppBundle\Entity\Rebrickable\Set;
 
 //TODO Refactor
-class RebrickableLoader extends Loader
+class RebrickableLoaderService extends BaseLoaderService
 {
     private $rebrickable_url;
 
     /**
      * ModelLoaderService constructor.
      */
-    public function setArguments($rebrickable_url)
+    public function __construct($rebrickable_url)
     {
         $this->rebrickable_url = $rebrickable_url;
     }
@@ -27,9 +27,9 @@ class RebrickableLoader extends Loader
 
             $this->truncateTables();
             $this->loadColorTable();
+            $this->loadPartTable();
             $this->loadCategoryTable();
             $this->loadThemeTable();
-            $this->loadPartTable();
             $this->loadSetTable();
             $this->loadInventoryTable();
             $this->loadInventoryPartTable();