diff --git a/app/Resources/views/macros/elements.html.twig b/app/Resources/views/macros/elements.html.twig
index 9b9c149..4a28385 100644
--- a/app/Resources/views/macros/elements.html.twig
+++ b/app/Resources/views/macros/elements.html.twig
@@ -3,7 +3,10 @@
         <div class="ui bordered fluid image">
             <a href="{{ url('model_detail', {'number': model.number})}}">
                 <div class="image">
-                    <img src="{{ asset('/ldraw/images/'~model.number~'.png') | imagine_filter('model_min') }}" data-src="{{ asset('/ldraw/images/'~model.number~'.png') | imagine_filter('model_min') }}" class="transition visible">
+                    <img src="{{ asset('/images/-1/'~model.number~'.png') | imagine_filter('model_min') }}" data-src="{{ asset('/ldraw/images/-1/'~model.number~'.png') | imagine_filter('model_min') }}" class="transition visible">
+                    {#<div class="image load">#}
+                        {#<img src="{{ model.number|partImage|imagine_filter('rebrickable_part_min') }}" data-src="{{ model.number|partImage|imagine_filter('rebrickable_part_min') }}" class="transition visible">#}
+                    {#</div>#}
                 </div>
                 <div class="ui bottom attached label {%  if model.parts|length == 0 %}black{% endif %}">{{ model.number }}</div>
             </a>
diff --git a/app/Resources/views/model/detail.html.twig b/app/Resources/views/model/detail.html.twig
index a4ea0ac..4600a22 100644
--- a/app/Resources/views/model/detail.html.twig
+++ b/app/Resources/views/model/detail.html.twig
@@ -11,7 +11,7 @@
     <div class="ui grid">
         <div class="column ten wide">
             <div id="model-viewer" class="model-container">
-                <img src="{{ asset('ldraw/images/'~model.number~'.png') | imagine_filter('model_large')}}">
+                <img src="{{ asset('/images/-1/'~model.number~'.png') | imagine_filter('model_large')}}">
             </div>
         </div>
         <div class="column six wide">
diff --git a/src/AppBundle/Service/LDViewService.php b/src/AppBundle/Service/LDViewService.php
index 3b9d4b9..72925d3 100644
--- a/src/AppBundle/Service/LDViewService.php
+++ b/src/AppBundle/Service/LDViewService.php
@@ -58,11 +58,11 @@ class LDViewService
      */
     public function datToStl($file, $rewrite = false)
     {
-        if (!$this->mediaFilesystem->has('ldraw'.DIRECTORY_SEPARATOR.'models')) {
-            $this->mediaFilesystem->createDir('ldraw'.DIRECTORY_SEPARATOR.'models');
+        if (!$this->mediaFilesystem->has('models')) {
+            $this->mediaFilesystem->createDir('models');
         }
 
-        $newFile = 'ldraw'.DIRECTORY_SEPARATOR.'models'.DIRECTORY_SEPARATOR.basename($file, '.dat').'.stl';
+        $newFile = 'models'.DIRECTORY_SEPARATOR.basename($file, '.dat').'.stl';
 
         if (!$this->mediaFilesystem->has($newFile) || $rewrite) {
             $this->runLDView([
@@ -70,7 +70,7 @@ class LDViewService
                 '-LDrawDir='.$this->ldrawLibraryContext->getAdapter()->getPathPrefix(),
                 '-ExportFiles=1',
                 '-ExportSuffix=.stl',
-                '-ExportsDir='.$this->mediaFilesystem->getAdapter()->getPathPrefix().'ldraw'.DIRECTORY_SEPARATOR.'models',
+                '-ExportsDir='.$this->mediaFilesystem->getAdapter()->getPathPrefix().'models',
             ]);
 
             // Check if file created successfully
@@ -96,11 +96,11 @@ class LDViewService
      */
     public function datToPng($file, $rewrite = false)
     {
-        if (!$this->mediaFilesystem->has('ldraw'.DIRECTORY_SEPARATOR.'images')) {
-            $this->mediaFilesystem->createDir('ldraw'.DIRECTORY_SEPARATOR.'images');
+        if (!$this->mediaFilesystem->has('images')) {
+            $this->mediaFilesystem->createDir('images');
         }
 
-        $newFile = 'ldraw'.DIRECTORY_SEPARATOR.'images'.DIRECTORY_SEPARATOR.basename($file, '.dat').'.png';
+        $newFile = 'images'.DIRECTORY_SEPARATOR.basename($file, '.dat').'.png';
 
         if (!$this->mediaFilesystem->has($newFile) || $this->rewrite) {
             $this->runLDView([
@@ -118,7 +118,7 @@ class LDViewService
                 '-SaveWidth=800',
                 '-CurveQuality=12',
                 '-DefaultLatLong=45,40',
-                '-SaveDir='.$this->mediaFilesystem->getAdapter()->getPathPrefix().'ldraw'.DIRECTORY_SEPARATOR.'images',
+                '-SaveDir='.$this->mediaFilesystem->getAdapter()->getPathPrefix().'images',
                 '-SaveSnapshots=1',
             ]);