diff --git a/library/src/main/java/com/bumptech/glide/load/MultiTransformation.java b/library/src/main/java/com/bumptech/glide/load/MultiTransformation.java
index 9e3a35916194095022c2c42828e4d2cacf134616..cc7ffce4e3f4df31408159615a9e97bb135ca9c4 100644
--- a/library/src/main/java/com/bumptech/glide/load/MultiTransformation.java
+++ b/library/src/main/java/com/bumptech/glide/load/MultiTransformation.java
@@ -1,6 +1,6 @@
 package com.bumptech.glide.load;
 
-import com.bumptech.glide.Resource;
+import com.bumptech.glide.load.engine.Resource;
 
 import java.util.List;
 
diff --git a/library/src/main/java/com/bumptech/glide/load/ResourceDecoder.java b/library/src/main/java/com/bumptech/glide/load/ResourceDecoder.java
index 0d8614c2b265affb4a6f24f4fae1a2c3dbed6d62..3e21364fb8fdd0d4493dfba699257ee2de0563a5 100644
--- a/library/src/main/java/com/bumptech/glide/load/ResourceDecoder.java
+++ b/library/src/main/java/com/bumptech/glide/load/ResourceDecoder.java
@@ -1,6 +1,6 @@
 package com.bumptech.glide.load;
 
-import com.bumptech.glide.Resource;
+import com.bumptech.glide.load.engine.Resource;
 
 import java.io.IOException;
 
diff --git a/library/src/main/java/com/bumptech/glide/load/ResourceEncoder.java b/library/src/main/java/com/bumptech/glide/load/ResourceEncoder.java
index 18eee5e595852727bd5e8f3a1c3537283aab7d5b..86f4e6e2dfab9b4a624f7bb747c0fab870851eff 100644
--- a/library/src/main/java/com/bumptech/glide/load/ResourceEncoder.java
+++ b/library/src/main/java/com/bumptech/glide/load/ResourceEncoder.java
@@ -1,6 +1,6 @@
 package com.bumptech.glide.load;
 
-import com.bumptech.glide.Resource;
+import com.bumptech.glide.load.engine.Resource;
 
 import java.io.OutputStream;
 
diff --git a/library/src/main/java/com/bumptech/glide/load/SkipCache.java b/library/src/main/java/com/bumptech/glide/load/SkipCache.java
index 12ec825a4ad73822a31744466e00cd27a8f6063c..d0945e1d0c9966a37da48134474dea02df30a693 100644
--- a/library/src/main/java/com/bumptech/glide/load/SkipCache.java
+++ b/library/src/main/java/com/bumptech/glide/load/SkipCache.java
@@ -1,6 +1,6 @@
 package com.bumptech.glide.load;
 
-import com.bumptech.glide.Resource;
+import com.bumptech.glide.load.engine.Resource;
 
 import java.io.OutputStream;
 
diff --git a/library/src/main/java/com/bumptech/glide/load/Transformation.java b/library/src/main/java/com/bumptech/glide/load/Transformation.java
index e37d07779b9884f3da416ea0fafd255d4018839a..a34bebc7fca79836507ee9d6798e3fb2b70e3ebf 100644
--- a/library/src/main/java/com/bumptech/glide/load/Transformation.java
+++ b/library/src/main/java/com/bumptech/glide/load/Transformation.java
@@ -1,6 +1,6 @@
 package com.bumptech.glide.load;
 
-import com.bumptech.glide.Resource;
+import com.bumptech.glide.load.engine.Resource;
 
 /**
  * A class for performing an arbitrary transformation on a bitmap
diff --git a/library/src/main/java/com/bumptech/glide/load/engine/Engine.java b/library/src/main/java/com/bumptech/glide/load/engine/Engine.java
index 8a20ae445abee781d99dadcc0da8ddf76c24bbc3..427104c85e4c25f872b1acaef7de1eda1a2e9930 100644
--- a/library/src/main/java/com/bumptech/glide/load/engine/Engine.java
+++ b/library/src/main/java/com/bumptech/glide/load/engine/Engine.java
@@ -5,7 +5,6 @@ import android.os.Looper;
 import android.os.MessageQueue;
 import android.util.Log;
 import com.bumptech.glide.Priority;
-import com.bumptech.glide.Resource;
 import com.bumptech.glide.load.Key;
 import com.bumptech.glide.load.ResourceDecoder;
 import com.bumptech.glide.load.ResourceEncoder;
diff --git a/library/src/main/java/com/bumptech/glide/load/engine/EngineJob.java b/library/src/main/java/com/bumptech/glide/load/engine/EngineJob.java
index 5447a2df494107c541e4ae10c53b1ec975886b98..ddf7996b0ff33a79fc77f055a36db0a39a0cd622 100644
--- a/library/src/main/java/com/bumptech/glide/load/engine/EngineJob.java
+++ b/library/src/main/java/com/bumptech/glide/load/engine/EngineJob.java
@@ -2,7 +2,6 @@ package com.bumptech.glide.load.engine;
 
 import android.os.Handler;
 import android.util.Log;
-import com.bumptech.glide.Resource;
 import com.bumptech.glide.load.Key;
 import com.bumptech.glide.request.ResourceCallback;
 import com.bumptech.glide.util.LogTime;
diff --git a/library/src/main/java/com/bumptech/glide/load/engine/EngineJobListener.java b/library/src/main/java/com/bumptech/glide/load/engine/EngineJobListener.java
index 25565ba819fd4d6b5972c857b52c70b8925ece20..e0c16410397fcf997ad3a68f32949539ffb1f753 100644
--- a/library/src/main/java/com/bumptech/glide/load/engine/EngineJobListener.java
+++ b/library/src/main/java/com/bumptech/glide/load/engine/EngineJobListener.java
@@ -1,6 +1,5 @@
 package com.bumptech.glide.load.engine;
 
-import com.bumptech.glide.Resource;
 import com.bumptech.glide.load.Key;
 
 public interface EngineJobListener {
diff --git a/library/src/main/java/com/bumptech/glide/Resource.java b/library/src/main/java/com/bumptech/glide/load/engine/Resource.java
similarity index 90%
rename from library/src/main/java/com/bumptech/glide/Resource.java
rename to library/src/main/java/com/bumptech/glide/load/engine/Resource.java
index 8a7dc481f2d7e86240b292e670372ba1a1755aaf..8340f0730a43621eb2dff4958bcb944c8b87695a 100644
--- a/library/src/main/java/com/bumptech/glide/Resource.java
+++ b/library/src/main/java/com/bumptech/glide/load/engine/Resource.java
@@ -1,4 +1,4 @@
-package com.bumptech.glide;
+package com.bumptech.glide.load.engine;
 
 import android.os.Looper;
 import com.bumptech.glide.load.Key;
@@ -18,7 +18,7 @@ public abstract class Resource<Z> {
     private Key key;
     private boolean isCacheable;
 
-    public interface ResourceListener {
+    interface ResourceListener {
         public void onResourceReleased(Key key, Resource resource);
     }
 
@@ -28,16 +28,16 @@ public abstract class Resource<Z> {
 
     protected abstract void recycleInternal();
 
-    public void setResourceListener(Key key, ResourceListener listener) {
+    void setResourceListener(Key key, ResourceListener listener) {
         this.key = key;
         this.listener = listener;
     }
 
-    public void setCacheable(boolean isCacheable) {
+    void setCacheable(boolean isCacheable) {
         this.isCacheable = isCacheable;
     }
 
-    public boolean isCacheable() {
+    boolean isCacheable() {
         return isCacheable;
     }
 
diff --git a/library/src/main/java/com/bumptech/glide/load/engine/ResourceRunner.java b/library/src/main/java/com/bumptech/glide/load/engine/ResourceRunner.java
index e8d60883bc7e440833a1e1ec97e8a53f657f680a..cce7f473bb040908ab14de624311486d2da46856 100644
--- a/library/src/main/java/com/bumptech/glide/load/engine/ResourceRunner.java
+++ b/library/src/main/java/com/bumptech/glide/load/engine/ResourceRunner.java
@@ -3,7 +3,6 @@ package com.bumptech.glide.load.engine;
 import android.os.SystemClock;
 import android.util.Log;
 import com.bumptech.glide.Priority;
-import com.bumptech.glide.Resource;
 import com.bumptech.glide.load.Key;
 import com.bumptech.glide.load.ResourceDecoder;
 import com.bumptech.glide.load.Transformation;
diff --git a/library/src/main/java/com/bumptech/glide/load/engine/SourceResourceRunner.java b/library/src/main/java/com/bumptech/glide/load/engine/SourceResourceRunner.java
index bbd8d329a746358d89adb9953a1e5e65f3b8db7a..d04a57d1765dea517e5a8288813e02b8df8f9fe8 100644
--- a/library/src/main/java/com/bumptech/glide/load/engine/SourceResourceRunner.java
+++ b/library/src/main/java/com/bumptech/glide/load/engine/SourceResourceRunner.java
@@ -3,7 +3,6 @@ package com.bumptech.glide.load.engine;
 import android.os.SystemClock;
 import android.util.Log;
 import com.bumptech.glide.Priority;
-import com.bumptech.glide.Resource;
 import com.bumptech.glide.load.Key;
 import com.bumptech.glide.load.ResourceDecoder;
 import com.bumptech.glide.load.ResourceEncoder;
diff --git a/library/src/main/java/com/bumptech/glide/load/engine/cache/LruResourceCache.java b/library/src/main/java/com/bumptech/glide/load/engine/cache/LruResourceCache.java
index 5e93659f954f89f917b894226b3f234bc96c2477..d3d64f7fcdddefdcc1ca65fa40a888642c45edc5 100644
--- a/library/src/main/java/com/bumptech/glide/load/engine/cache/LruResourceCache.java
+++ b/library/src/main/java/com/bumptech/glide/load/engine/cache/LruResourceCache.java
@@ -1,7 +1,7 @@
 package com.bumptech.glide.load.engine.cache;
 
 import com.bumptech.glide.load.Key;
-import com.bumptech.glide.Resource;
+import com.bumptech.glide.load.engine.Resource;
 import com.bumptech.glide.util.LruCache;
 
 import static android.content.ComponentCallbacks2.TRIM_MEMORY_BACKGROUND;
diff --git a/library/src/main/java/com/bumptech/glide/load/engine/cache/MemoryCache.java b/library/src/main/java/com/bumptech/glide/load/engine/cache/MemoryCache.java
index a92d1dfb4d8a66b19efe9b6e7ba56e28a44583c9..23c7d771138e83fe35bc5421840d2a84574e7816 100644
--- a/library/src/main/java/com/bumptech/glide/load/engine/cache/MemoryCache.java
+++ b/library/src/main/java/com/bumptech/glide/load/engine/cache/MemoryCache.java
@@ -2,7 +2,7 @@ package com.bumptech.glide.load.engine.cache;
 
 import android.content.ComponentCallbacks2;
 import com.bumptech.glide.load.Key;
-import com.bumptech.glide.Resource;
+import com.bumptech.glide.load.engine.Resource;
 
 /**
  * An interface for adding and removing resources from an in memory cache
diff --git a/library/src/main/java/com/bumptech/glide/load/engine/cache/MemoryCacheAdapter.java b/library/src/main/java/com/bumptech/glide/load/engine/cache/MemoryCacheAdapter.java
index 40cd86fd64fb70ab9fd3b34bdf30e0fdb85d1eec..ab5ad84280d0d3509d487f427d2c5c1d4274c67c 100644
--- a/library/src/main/java/com/bumptech/glide/load/engine/cache/MemoryCacheAdapter.java
+++ b/library/src/main/java/com/bumptech/glide/load/engine/cache/MemoryCacheAdapter.java
@@ -1,7 +1,7 @@
 package com.bumptech.glide.load.engine.cache;
 
 import com.bumptech.glide.load.Key;
-import com.bumptech.glide.Resource;
+import com.bumptech.glide.load.engine.Resource;
 
 public class MemoryCacheAdapter implements MemoryCache {
 
diff --git a/library/src/main/java/com/bumptech/glide/load/resource/NullCacheDecoder.java b/library/src/main/java/com/bumptech/glide/load/resource/NullCacheDecoder.java
index 4505450eb47273a65b915baa80230fced51f422d..f35cf80cd2f50ff764e905ae3a456eed40e90cb7 100644
--- a/library/src/main/java/com/bumptech/glide/load/resource/NullCacheDecoder.java
+++ b/library/src/main/java/com/bumptech/glide/load/resource/NullCacheDecoder.java
@@ -1,6 +1,6 @@
 package com.bumptech.glide.load.resource;
 
-import com.bumptech.glide.Resource;
+import com.bumptech.glide.load.engine.Resource;
 import com.bumptech.glide.load.ResourceDecoder;
 
 import java.io.IOException;
diff --git a/library/src/main/java/com/bumptech/glide/load/resource/bitmap/BitmapDrawableResource.java b/library/src/main/java/com/bumptech/glide/load/resource/bitmap/BitmapDrawableResource.java
index af95f6409bb3c9d0de720f2b905d8faae62664f0..126253d66e4a51a40760b1e80c7b4c475e99d325 100644
--- a/library/src/main/java/com/bumptech/glide/load/resource/bitmap/BitmapDrawableResource.java
+++ b/library/src/main/java/com/bumptech/glide/load/resource/bitmap/BitmapDrawableResource.java
@@ -1,7 +1,7 @@
 package com.bumptech.glide.load.resource.bitmap;
 
 import android.graphics.drawable.BitmapDrawable;
-import com.bumptech.glide.Resource;
+import com.bumptech.glide.load.engine.Resource;
 import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool;
 import com.bumptech.glide.util.Util;
 
diff --git a/library/src/main/java/com/bumptech/glide/load/resource/bitmap/BitmapEncoder.java b/library/src/main/java/com/bumptech/glide/load/resource/bitmap/BitmapEncoder.java
index 2d67c272871e628ff72cdf500aa5e894044a4b36..145aee79b1f050bb57c744d3ec931dcdcca7dc9a 100644
--- a/library/src/main/java/com/bumptech/glide/load/resource/bitmap/BitmapEncoder.java
+++ b/library/src/main/java/com/bumptech/glide/load/resource/bitmap/BitmapEncoder.java
@@ -1,7 +1,7 @@
 package com.bumptech.glide.load.resource.bitmap;
 
 import android.graphics.Bitmap;
-import com.bumptech.glide.Resource;
+import com.bumptech.glide.load.engine.Resource;
 import com.bumptech.glide.load.ResourceEncoder;
 
 import java.io.OutputStream;
diff --git a/library/src/main/java/com/bumptech/glide/load/resource/bitmap/BitmapResource.java b/library/src/main/java/com/bumptech/glide/load/resource/bitmap/BitmapResource.java
index 74e2425869a69a0197ac45e05099625eff99e328..e72268b887c31760dc873f72917ab1f60a769b20 100644
--- a/library/src/main/java/com/bumptech/glide/load/resource/bitmap/BitmapResource.java
+++ b/library/src/main/java/com/bumptech/glide/load/resource/bitmap/BitmapResource.java
@@ -1,7 +1,7 @@
 package com.bumptech.glide.load.resource.bitmap;
 
 import android.graphics.Bitmap;
-import com.bumptech.glide.Resource;
+import com.bumptech.glide.load.engine.Resource;
 import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool;
 import com.bumptech.glide.util.Util;
 
diff --git a/library/src/main/java/com/bumptech/glide/load/resource/bitmap/CenterCrop.java b/library/src/main/java/com/bumptech/glide/load/resource/bitmap/CenterCrop.java
index e6912640aa8f5eab04aa1b6613cea8a7d15a7410..28135ba56bf9b38ea2e368ec3d522f309451b136 100644
--- a/library/src/main/java/com/bumptech/glide/load/resource/bitmap/CenterCrop.java
+++ b/library/src/main/java/com/bumptech/glide/load/resource/bitmap/CenterCrop.java
@@ -1,7 +1,7 @@
 package com.bumptech.glide.load.resource.bitmap;
 
 import android.graphics.Bitmap;
-import com.bumptech.glide.Resource;
+import com.bumptech.glide.load.engine.Resource;
 import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool;
 import com.bumptech.glide.load.Transformation;
 
diff --git a/library/src/main/java/com/bumptech/glide/load/resource/bitmap/FileDescriptorBitmapDecoder.java b/library/src/main/java/com/bumptech/glide/load/resource/bitmap/FileDescriptorBitmapDecoder.java
index b2449915d4ab3fd6978b1abe4b6d4cd302af65c0..15dc490413cff85dbba7142b254c6bd5681c78d9 100644
--- a/library/src/main/java/com/bumptech/glide/load/resource/bitmap/FileDescriptorBitmapDecoder.java
+++ b/library/src/main/java/com/bumptech/glide/load/resource/bitmap/FileDescriptorBitmapDecoder.java
@@ -2,7 +2,7 @@ package com.bumptech.glide.load.resource.bitmap;
 
 import android.graphics.Bitmap;
 import android.os.ParcelFileDescriptor;
-import com.bumptech.glide.Resource;
+import com.bumptech.glide.load.engine.Resource;
 import com.bumptech.glide.load.ResourceDecoder;
 import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool;
 import com.bumptech.glide.load.DecodeFormat;
diff --git a/library/src/main/java/com/bumptech/glide/load/resource/bitmap/FitCenter.java b/library/src/main/java/com/bumptech/glide/load/resource/bitmap/FitCenter.java
index 7bd4675c68198d65d1a85db36e1b0fa4016a712a..e8d11977fa48f062cea0e7c06e455ddef23619df 100644
--- a/library/src/main/java/com/bumptech/glide/load/resource/bitmap/FitCenter.java
+++ b/library/src/main/java/com/bumptech/glide/load/resource/bitmap/FitCenter.java
@@ -1,7 +1,7 @@
 package com.bumptech.glide.load.resource.bitmap;
 
 import android.graphics.Bitmap;
-import com.bumptech.glide.Resource;
+import com.bumptech.glide.load.engine.Resource;
 import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool;
 import com.bumptech.glide.load.Transformation;
 
diff --git a/library/src/main/java/com/bumptech/glide/load/resource/bitmap/ImageVideoBitmapDecoder.java b/library/src/main/java/com/bumptech/glide/load/resource/bitmap/ImageVideoBitmapDecoder.java
index a258ee713bf498d28a12b8e80c7ad93d8220d93b..53436d69b5e73c29d73216cd9041d99111ea0697 100644
--- a/library/src/main/java/com/bumptech/glide/load/resource/bitmap/ImageVideoBitmapDecoder.java
+++ b/library/src/main/java/com/bumptech/glide/load/resource/bitmap/ImageVideoBitmapDecoder.java
@@ -3,7 +3,7 @@ package com.bumptech.glide.load.resource.bitmap;
 import android.graphics.Bitmap;
 import android.os.ParcelFileDescriptor;
 import android.util.Log;
-import com.bumptech.glide.Resource;
+import com.bumptech.glide.load.engine.Resource;
 import com.bumptech.glide.load.ResourceDecoder;
 import com.bumptech.glide.load.model.ImageVideoWrapper;
 
diff --git a/library/src/main/java/com/bumptech/glide/load/resource/bitmap/StreamBitmapDecoder.java b/library/src/main/java/com/bumptech/glide/load/resource/bitmap/StreamBitmapDecoder.java
index 97826b24c832dd18999562c095d4816eb6902131..b8bdb5ba1a4368d55777e364c9c2e9b15de3156c 100644
--- a/library/src/main/java/com/bumptech/glide/load/resource/bitmap/StreamBitmapDecoder.java
+++ b/library/src/main/java/com/bumptech/glide/load/resource/bitmap/StreamBitmapDecoder.java
@@ -3,7 +3,7 @@ package com.bumptech.glide.load.resource.bitmap;
 import android.content.Context;
 import android.graphics.Bitmap;
 import com.bumptech.glide.Glide;
-import com.bumptech.glide.Resource;
+import com.bumptech.glide.load.engine.Resource;
 import com.bumptech.glide.load.DecodeFormat;
 import com.bumptech.glide.load.ResourceDecoder;
 import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool;
diff --git a/library/src/main/java/com/bumptech/glide/load/resource/bytes/BytesResource.java b/library/src/main/java/com/bumptech/glide/load/resource/bytes/BytesResource.java
index 265c7fd3be3136377f639d8f12242233130e5e8f..b6d369bba2ebe1b44002e755af1085b217e3d68b 100644
--- a/library/src/main/java/com/bumptech/glide/load/resource/bytes/BytesResource.java
+++ b/library/src/main/java/com/bumptech/glide/load/resource/bytes/BytesResource.java
@@ -1,6 +1,6 @@
 package com.bumptech.glide.load.resource.bytes;
 
-import com.bumptech.glide.Resource;
+import com.bumptech.glide.load.engine.Resource;
 
 public class BytesResource extends Resource<byte[]> {
     private byte[] bytes;
diff --git a/library/src/main/java/com/bumptech/glide/load/resource/gif/GifDataResource.java b/library/src/main/java/com/bumptech/glide/load/resource/gif/GifDataResource.java
index 78a7ef200ce51c34d8b5bf2800ff15b43d43fa5c..b7cc468dee0823b2d3f6d73c8641c9f1a7bc4eb5 100644
--- a/library/src/main/java/com/bumptech/glide/load/resource/gif/GifDataResource.java
+++ b/library/src/main/java/com/bumptech/glide/load/resource/gif/GifDataResource.java
@@ -1,6 +1,6 @@
 package com.bumptech.glide.load.resource.gif;
 
-import com.bumptech.glide.Resource;
+import com.bumptech.glide.load.engine.Resource;
 
 public class GifDataResource extends Resource<GifData> {
     private GifData gifData;
diff --git a/library/src/main/java/com/bumptech/glide/load/resource/gif/GifDataTransformation.java b/library/src/main/java/com/bumptech/glide/load/resource/gif/GifDataTransformation.java
index cb2b9924a726701c950c89c65a47a46c0dee41cb..22402e2dee843472984ffa9c6b53d4b04fd2a590 100644
--- a/library/src/main/java/com/bumptech/glide/load/resource/gif/GifDataTransformation.java
+++ b/library/src/main/java/com/bumptech/glide/load/resource/gif/GifDataTransformation.java
@@ -1,7 +1,7 @@
 package com.bumptech.glide.load.resource.gif;
 
 import android.graphics.Bitmap;
-import com.bumptech.glide.Resource;
+import com.bumptech.glide.load.engine.Resource;
 import com.bumptech.glide.load.MultiTransformation;
 import com.bumptech.glide.load.Transformation;
 
diff --git a/library/src/main/java/com/bumptech/glide/load/resource/gif/GifDrawableResource.java b/library/src/main/java/com/bumptech/glide/load/resource/gif/GifDrawableResource.java
index 0da6f86d5493479121143ed6d978ac9c068fbc7e..cfa984b7bbbe5f09f3cf0de4084b8c809b0cff07 100644
--- a/library/src/main/java/com/bumptech/glide/load/resource/gif/GifDrawableResource.java
+++ b/library/src/main/java/com/bumptech/glide/load/resource/gif/GifDrawableResource.java
@@ -1,6 +1,6 @@
 package com.bumptech.glide.load.resource.gif;
 
-import com.bumptech.glide.Resource;
+import com.bumptech.glide.load.engine.Resource;
 
 public class GifDrawableResource extends Resource<GifDrawable> {
     private Resource<GifData> wrapped;
diff --git a/library/src/main/java/com/bumptech/glide/load/resource/gif/GifFrameResourceDecoder.java b/library/src/main/java/com/bumptech/glide/load/resource/gif/GifFrameResourceDecoder.java
index d07709f017767b18cf27b897e696fbb7c2d7a97a..ee2fc821fcd9c1d0aa7906ac50f3689131bcfa04 100644
--- a/library/src/main/java/com/bumptech/glide/load/resource/gif/GifFrameResourceDecoder.java
+++ b/library/src/main/java/com/bumptech/glide/load/resource/gif/GifFrameResourceDecoder.java
@@ -1,7 +1,7 @@
 package com.bumptech.glide.load.resource.gif;
 
 import android.graphics.Bitmap;
-import com.bumptech.glide.Resource;
+import com.bumptech.glide.load.engine.Resource;
 import com.bumptech.glide.gifdecoder.GifDecoder;
 import com.bumptech.glide.load.ResourceDecoder;
 import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool;
diff --git a/library/src/main/java/com/bumptech/glide/load/resource/gif/GifResourceEncoder.java b/library/src/main/java/com/bumptech/glide/load/resource/gif/GifResourceEncoder.java
index 9bce19ef3a555d3d3b9129269dc69261d268066e..31893c9a9fc7832f284e125f43841e37cc8b400c 100644
--- a/library/src/main/java/com/bumptech/glide/load/resource/gif/GifResourceEncoder.java
+++ b/library/src/main/java/com/bumptech/glide/load/resource/gif/GifResourceEncoder.java
@@ -1,7 +1,7 @@
 package com.bumptech.glide.load.resource.gif;
 
 import android.util.Log;
-import com.bumptech.glide.Resource;
+import com.bumptech.glide.load.engine.Resource;
 import com.bumptech.glide.load.ResourceEncoder;
 
 import java.io.IOException;
diff --git a/library/src/main/java/com/bumptech/glide/load/resource/gifbitmap/GifBitmapWrapper.java b/library/src/main/java/com/bumptech/glide/load/resource/gifbitmap/GifBitmapWrapper.java
index 3dc4bf570ac58f0da9eea491375c7f5121f8e002..2540f5932111ad5123e0b055c5b9ed95869332b2 100644
--- a/library/src/main/java/com/bumptech/glide/load/resource/gifbitmap/GifBitmapWrapper.java
+++ b/library/src/main/java/com/bumptech/glide/load/resource/gifbitmap/GifBitmapWrapper.java
@@ -1,7 +1,7 @@
 package com.bumptech.glide.load.resource.gifbitmap;
 
 import android.graphics.Bitmap;
-import com.bumptech.glide.Resource;
+import com.bumptech.glide.load.engine.Resource;
 import com.bumptech.glide.load.resource.gif.GifData;
 
 public class GifBitmapWrapper {
diff --git a/library/src/main/java/com/bumptech/glide/load/resource/gifbitmap/GifBitmapWrapperResource.java b/library/src/main/java/com/bumptech/glide/load/resource/gifbitmap/GifBitmapWrapperResource.java
index 25f105f7168f5196f0a0316ed1a748e9e449a49d..22e6b9696d0131c045c2dcc87e6626abf4a68539 100644
--- a/library/src/main/java/com/bumptech/glide/load/resource/gifbitmap/GifBitmapWrapperResource.java
+++ b/library/src/main/java/com/bumptech/glide/load/resource/gifbitmap/GifBitmapWrapperResource.java
@@ -1,7 +1,7 @@
 package com.bumptech.glide.load.resource.gifbitmap;
 
 import android.graphics.Bitmap;
-import com.bumptech.glide.Resource;
+import com.bumptech.glide.load.engine.Resource;
 import com.bumptech.glide.load.resource.gif.GifData;
 
 public class GifBitmapWrapperResource extends Resource<GifBitmapWrapper> {
diff --git a/library/src/main/java/com/bumptech/glide/load/resource/gifbitmap/GifBitmapWrapperResourceDecoder.java b/library/src/main/java/com/bumptech/glide/load/resource/gifbitmap/GifBitmapWrapperResourceDecoder.java
index 6183cfce2aeb170068cf0e0d9e25a4de09e000ca..28b02a459b91bb0bc0a6a71702309a74ab0e55a6 100644
--- a/library/src/main/java/com/bumptech/glide/load/resource/gifbitmap/GifBitmapWrapperResourceDecoder.java
+++ b/library/src/main/java/com/bumptech/glide/load/resource/gifbitmap/GifBitmapWrapperResourceDecoder.java
@@ -1,7 +1,7 @@
 package com.bumptech.glide.load.resource.gifbitmap;
 
 import android.graphics.Bitmap;
-import com.bumptech.glide.Resource;
+import com.bumptech.glide.load.engine.Resource;
 import com.bumptech.glide.load.ResourceDecoder;
 import com.bumptech.glide.load.model.ImageVideoWrapper;
 import com.bumptech.glide.load.resource.bitmap.ImageHeaderParser;
diff --git a/library/src/main/java/com/bumptech/glide/load/resource/gifbitmap/GifBitmapWrapperResourceEncoder.java b/library/src/main/java/com/bumptech/glide/load/resource/gifbitmap/GifBitmapWrapperResourceEncoder.java
index 903a3ea6824b9f675920e168912f2597ecabd977..5a10cece741c11768158b955bc62b930583cdc03 100644
--- a/library/src/main/java/com/bumptech/glide/load/resource/gifbitmap/GifBitmapWrapperResourceEncoder.java
+++ b/library/src/main/java/com/bumptech/glide/load/resource/gifbitmap/GifBitmapWrapperResourceEncoder.java
@@ -1,7 +1,7 @@
 package com.bumptech.glide.load.resource.gifbitmap;
 
 import android.graphics.Bitmap;
-import com.bumptech.glide.Resource;
+import com.bumptech.glide.load.engine.Resource;
 import com.bumptech.glide.load.ResourceEncoder;
 import com.bumptech.glide.load.resource.gif.GifData;
 
diff --git a/library/src/main/java/com/bumptech/glide/load/resource/gifbitmap/GifBitmapWrapperStreamResourceDecoder.java b/library/src/main/java/com/bumptech/glide/load/resource/gifbitmap/GifBitmapWrapperStreamResourceDecoder.java
index 80ebbca76623f6b48cfd17e8241f2222934c9d76..51ccb2e1b4f31cc29c5a2dfc02b25df0dc251d1d 100644
--- a/library/src/main/java/com/bumptech/glide/load/resource/gifbitmap/GifBitmapWrapperStreamResourceDecoder.java
+++ b/library/src/main/java/com/bumptech/glide/load/resource/gifbitmap/GifBitmapWrapperStreamResourceDecoder.java
@@ -1,6 +1,6 @@
 package com.bumptech.glide.load.resource.gifbitmap;
 
-import com.bumptech.glide.Resource;
+import com.bumptech.glide.load.engine.Resource;
 import com.bumptech.glide.load.ResourceDecoder;
 import com.bumptech.glide.load.model.ImageVideoWrapper;
 
diff --git a/library/src/main/java/com/bumptech/glide/load/resource/gifbitmap/GifBitmapWrapperTransformation.java b/library/src/main/java/com/bumptech/glide/load/resource/gifbitmap/GifBitmapWrapperTransformation.java
index 9b4ffcfe8371919774cda8a17c78e2172997ef5b..f0f24047c5e230cc9ffbb9118de2d3098395ba71 100644
--- a/library/src/main/java/com/bumptech/glide/load/resource/gifbitmap/GifBitmapWrapperTransformation.java
+++ b/library/src/main/java/com/bumptech/glide/load/resource/gifbitmap/GifBitmapWrapperTransformation.java
@@ -1,7 +1,7 @@
 package com.bumptech.glide.load.resource.gifbitmap;
 
 import android.graphics.Bitmap;
-import com.bumptech.glide.Resource;
+import com.bumptech.glide.load.engine.Resource;
 import com.bumptech.glide.load.Transformation;
 import com.bumptech.glide.load.resource.gif.GifData;
 import com.bumptech.glide.load.resource.gif.GifDataTransformation;
diff --git a/library/src/main/java/com/bumptech/glide/load/resource/transcode/BitmapBytesTranscoder.java b/library/src/main/java/com/bumptech/glide/load/resource/transcode/BitmapBytesTranscoder.java
index 52859549655f5d84dda7f6485fa7bc376603d3fc..96b9d6622eed0163c4a781ed8d3a2677e1d64e99 100644
--- a/library/src/main/java/com/bumptech/glide/load/resource/transcode/BitmapBytesTranscoder.java
+++ b/library/src/main/java/com/bumptech/glide/load/resource/transcode/BitmapBytesTranscoder.java
@@ -1,7 +1,7 @@
 package com.bumptech.glide.load.resource.transcode;
 
 import android.graphics.Bitmap;
-import com.bumptech.glide.Resource;
+import com.bumptech.glide.load.engine.Resource;
 import com.bumptech.glide.load.resource.bytes.BytesResource;
 
 import java.io.ByteArrayOutputStream;
diff --git a/library/src/main/java/com/bumptech/glide/load/resource/transcode/BitmapDrawableTranscoder.java b/library/src/main/java/com/bumptech/glide/load/resource/transcode/BitmapDrawableTranscoder.java
index 9c85efdd4de2ce9a10be5d5f248d72c9b8075f52..e511865d9993c838415f82edc7979b8ed7ad1a51 100644
--- a/library/src/main/java/com/bumptech/glide/load/resource/transcode/BitmapDrawableTranscoder.java
+++ b/library/src/main/java/com/bumptech/glide/load/resource/transcode/BitmapDrawableTranscoder.java
@@ -3,7 +3,7 @@ package com.bumptech.glide.load.resource.transcode;
 import android.content.res.Resources;
 import android.graphics.Bitmap;
 import android.graphics.drawable.BitmapDrawable;
-import com.bumptech.glide.Resource;
+import com.bumptech.glide.load.engine.Resource;
 import com.bumptech.glide.load.resource.bitmap.BitmapDrawableResource;
 import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool;
 
diff --git a/library/src/main/java/com/bumptech/glide/load/resource/transcode/GifBitmapWrapperDrawableTranscoder.java b/library/src/main/java/com/bumptech/glide/load/resource/transcode/GifBitmapWrapperDrawableTranscoder.java
index 29bf00bbef680580b2580257c04049d472ced363..b5336f050b3816e2f26cbfc0047e7e2d05489d52 100644
--- a/library/src/main/java/com/bumptech/glide/load/resource/transcode/GifBitmapWrapperDrawableTranscoder.java
+++ b/library/src/main/java/com/bumptech/glide/load/resource/transcode/GifBitmapWrapperDrawableTranscoder.java
@@ -2,7 +2,7 @@ package com.bumptech.glide.load.resource.transcode;
 
 import android.graphics.Bitmap;
 import android.graphics.drawable.Drawable;
-import com.bumptech.glide.Resource;
+import com.bumptech.glide.load.engine.Resource;
 import com.bumptech.glide.load.resource.gif.GifData;
 import com.bumptech.glide.load.resource.gifbitmap.GifBitmapWrapper;
 
diff --git a/library/src/main/java/com/bumptech/glide/load/resource/transcode/GifDataBytesTranscoder.java b/library/src/main/java/com/bumptech/glide/load/resource/transcode/GifDataBytesTranscoder.java
index 437ff8e43795984321dbf23cdf4ce0ae81df700a..40f92478076bf105e103f09a9c6e51f41afbbb66 100644
--- a/library/src/main/java/com/bumptech/glide/load/resource/transcode/GifDataBytesTranscoder.java
+++ b/library/src/main/java/com/bumptech/glide/load/resource/transcode/GifDataBytesTranscoder.java
@@ -1,6 +1,6 @@
 package com.bumptech.glide.load.resource.transcode;
 
-import com.bumptech.glide.Resource;
+import com.bumptech.glide.load.engine.Resource;
 import com.bumptech.glide.load.resource.bytes.BytesResource;
 import com.bumptech.glide.load.resource.gif.GifData;
 
diff --git a/library/src/main/java/com/bumptech/glide/load/resource/transcode/GifDataDrawableTranscoder.java b/library/src/main/java/com/bumptech/glide/load/resource/transcode/GifDataDrawableTranscoder.java
index ef77bd124d3b4193af7a5d3621b287dd541f4c8d..c863464775e461239b7e80bf209e3d90f4c2b925 100644
--- a/library/src/main/java/com/bumptech/glide/load/resource/transcode/GifDataDrawableTranscoder.java
+++ b/library/src/main/java/com/bumptech/glide/load/resource/transcode/GifDataDrawableTranscoder.java
@@ -1,6 +1,6 @@
 package com.bumptech.glide.load.resource.transcode;
 
-import com.bumptech.glide.Resource;
+import com.bumptech.glide.load.engine.Resource;
 import com.bumptech.glide.load.resource.gif.GifData;
 import com.bumptech.glide.load.resource.gif.GifDrawable;
 import com.bumptech.glide.load.resource.gif.GifDrawableResource;
diff --git a/library/src/main/java/com/bumptech/glide/load/resource/transcode/ResourceTranscoder.java b/library/src/main/java/com/bumptech/glide/load/resource/transcode/ResourceTranscoder.java
index e8ab9ebdd458009b7b9f15598878a51929d6587a..d82dad9c8a7365b0b1594c4ce34a931464df83af 100644
--- a/library/src/main/java/com/bumptech/glide/load/resource/transcode/ResourceTranscoder.java
+++ b/library/src/main/java/com/bumptech/glide/load/resource/transcode/ResourceTranscoder.java
@@ -1,6 +1,6 @@
 package com.bumptech.glide.load.resource.transcode;
 
-import com.bumptech.glide.Resource;
+import com.bumptech.glide.load.engine.Resource;
 
 /**
  * Transcodes a resource of one type to a resource of another type.
diff --git a/library/src/main/java/com/bumptech/glide/load/resource/transcode/UnitTranscoder.java b/library/src/main/java/com/bumptech/glide/load/resource/transcode/UnitTranscoder.java
index 58bb5dafa6ea490456fc7f46748bf1ca22a4cf9a..fd81a9d350625982f90b695b7e361bd1b04cd683 100644
--- a/library/src/main/java/com/bumptech/glide/load/resource/transcode/UnitTranscoder.java
+++ b/library/src/main/java/com/bumptech/glide/load/resource/transcode/UnitTranscoder.java
@@ -1,6 +1,6 @@
 package com.bumptech.glide.load.resource.transcode;
 
-import com.bumptech.glide.Resource;
+import com.bumptech.glide.load.engine.Resource;
 
 public class UnitTranscoder implements ResourceTranscoder {
     private static final UnitTranscoder UNIT_TRANSCODER = new UnitTranscoder();
diff --git a/library/src/main/java/com/bumptech/glide/request/GenericRequest.java b/library/src/main/java/com/bumptech/glide/request/GenericRequest.java
index 906264eaa8629094eb8455203cf6154b6c82f747..ea6fb3224711804a9301bf614277474cf36127ca 100644
--- a/library/src/main/java/com/bumptech/glide/request/GenericRequest.java
+++ b/library/src/main/java/com/bumptech/glide/request/GenericRequest.java
@@ -4,7 +4,7 @@ import android.content.Context;
 import android.graphics.drawable.Drawable;
 import android.util.Log;
 import com.bumptech.glide.Priority;
-import com.bumptech.glide.Resource;
+import com.bumptech.glide.load.engine.Resource;
 import com.bumptech.glide.load.ResourceDecoder;
 import com.bumptech.glide.load.ResourceEncoder;
 import com.bumptech.glide.load.Transformation;
diff --git a/library/src/main/java/com/bumptech/glide/request/ResourceCallback.java b/library/src/main/java/com/bumptech/glide/request/ResourceCallback.java
index da5591ef502f4b4f8bedcc7b8a1dfedf0edf8049..e1332f8bc45c0d51e539379488db2f9c57aba052 100644
--- a/library/src/main/java/com/bumptech/glide/request/ResourceCallback.java
+++ b/library/src/main/java/com/bumptech/glide/request/ResourceCallback.java
@@ -1,6 +1,6 @@
 package com.bumptech.glide.request;
 
-import com.bumptech.glide.Resource;
+import com.bumptech.glide.load.engine.Resource;
 
 public interface ResourceCallback {
 
diff --git a/library/src/test/java/com/bumptech/glide/GlideTest.java b/library/src/test/java/com/bumptech/glide/GlideTest.java
index bd69415aa3021fec5ae7c18cadd9d300d8dd5aad..859a126c3f433130f30303db916d1b40af85bab6 100644
--- a/library/src/test/java/com/bumptech/glide/GlideTest.java
+++ b/library/src/test/java/com/bumptech/glide/GlideTest.java
@@ -20,6 +20,7 @@ import com.android.volley.toolbox.NoCache;
 import com.bumptech.glide.load.ResourceDecoder;
 import com.bumptech.glide.load.ResourceEncoder;
 import com.bumptech.glide.load.data.DataFetcher;
+import com.bumptech.glide.load.engine.Resource;
 import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool;
 import com.bumptech.glide.load.engine.cache.DiskCache;
 import com.bumptech.glide.load.engine.cache.MemoryCache;
diff --git a/library/src/test/java/com/bumptech/glide/load/MultiTransformationTest.java b/library/src/test/java/com/bumptech/glide/load/MultiTransformationTest.java
index 55b4e6638f3e9c4f945a53fea119ced92d41cdf0..69609039f4fc6f44125d9f554d71913b7ff191d2 100644
--- a/library/src/test/java/com/bumptech/glide/load/MultiTransformationTest.java
+++ b/library/src/test/java/com/bumptech/glide/load/MultiTransformationTest.java
@@ -1,6 +1,6 @@
 package com.bumptech.glide.load;
 
-import com.bumptech.glide.Resource;
+import com.bumptech.glide.load.engine.Resource;
 import org.junit.Test;
 
 import java.util.ArrayList;
diff --git a/library/src/test/java/com/bumptech/glide/load/SkipCacheTest.java b/library/src/test/java/com/bumptech/glide/load/SkipCacheTest.java
index c8cd0a225d7eccda9abdc32e81c3620cfd01e7c6..8e49239365a6bc2eb09ebed686a8bfd93c9896e3 100644
--- a/library/src/test/java/com/bumptech/glide/load/SkipCacheTest.java
+++ b/library/src/test/java/com/bumptech/glide/load/SkipCacheTest.java
@@ -1,6 +1,6 @@
 package com.bumptech.glide.load;
 
-import com.bumptech.glide.Resource;
+import com.bumptech.glide.load.engine.Resource;
 import org.junit.Test;
 
 import java.io.ByteArrayOutputStream;
diff --git a/library/src/test/java/com/bumptech/glide/load/engine/EngineJobTest.java b/library/src/test/java/com/bumptech/glide/load/engine/EngineJobTest.java
index 7fb0fb64abdd7a203f0f592b191be975a727d379..44cdf4fbefff7d675ac87d76a3e2b77a43b1944c 100644
--- a/library/src/test/java/com/bumptech/glide/load/engine/EngineJobTest.java
+++ b/library/src/test/java/com/bumptech/glide/load/engine/EngineJobTest.java
@@ -1,7 +1,6 @@
 package com.bumptech.glide.load.engine;
 
 import android.os.Handler;
-import com.bumptech.glide.Resource;
 import com.bumptech.glide.load.Key;
 import com.bumptech.glide.load.engine.cache.MemoryCache;
 import com.bumptech.glide.request.ResourceCallback;
diff --git a/library/src/test/java/com/bumptech/glide/load/engine/EngineTest.java b/library/src/test/java/com/bumptech/glide/load/engine/EngineTest.java
index 773c406c88c89d48fa84dcd9b548b237192d3cef..ed8ea65e5de328559bfdabad11ea39df32d65a1c 100644
--- a/library/src/test/java/com/bumptech/glide/load/engine/EngineTest.java
+++ b/library/src/test/java/com/bumptech/glide/load/engine/EngineTest.java
@@ -1,7 +1,6 @@
 package com.bumptech.glide.load.engine;
 
 import com.bumptech.glide.Priority;
-import com.bumptech.glide.Resource;
 import com.bumptech.glide.load.Key;
 import com.bumptech.glide.load.ResourceDecoder;
 import com.bumptech.glide.load.ResourceEncoder;
diff --git a/library/src/test/java/com/bumptech/glide/load/engine/ResourceRunnerTest.java b/library/src/test/java/com/bumptech/glide/load/engine/ResourceRunnerTest.java
index 82b0b734cceb403f3b873928d6ea8c7abe69ff16..2e8a9f385f57cd1ec39abca5489886c4dd125602 100644
--- a/library/src/test/java/com/bumptech/glide/load/engine/ResourceRunnerTest.java
+++ b/library/src/test/java/com/bumptech/glide/load/engine/ResourceRunnerTest.java
@@ -1,7 +1,6 @@
 package com.bumptech.glide.load.engine;
 
 import com.bumptech.glide.Priority;
-import com.bumptech.glide.Resource;
 import com.bumptech.glide.load.Key;
 import com.bumptech.glide.load.ResourceDecoder;
 import com.bumptech.glide.load.Transformation;
diff --git a/library/src/test/java/com/bumptech/glide/ResourceTest.java b/library/src/test/java/com/bumptech/glide/load/engine/ResourceTest.java
similarity index 91%
rename from library/src/test/java/com/bumptech/glide/ResourceTest.java
rename to library/src/test/java/com/bumptech/glide/load/engine/ResourceTest.java
index 4adbb8ee571e66f1b7aaa3bf354871571172b671..6e00a9c3c90496e10637250d5bcec9b8119cb579 100644
--- a/library/src/test/java/com/bumptech/glide/ResourceTest.java
+++ b/library/src/test/java/com/bumptech/glide/load/engine/ResourceTest.java
@@ -1,4 +1,4 @@
-package com.bumptech.glide;
+package com.bumptech.glide.load.engine;
 
 import com.bumptech.glide.load.Key;
 import junit.framework.Assert;
@@ -8,6 +8,8 @@ import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
@@ -119,6 +121,14 @@ public class ResourceTest {
         resource.release();
     }
 
+    @Test
+    public void testCanSetAndGetIsCacheable() {
+        resource.setCacheable(true);
+        assertTrue(resource.isCacheable());
+        resource.setCacheable(false);
+        assertFalse(resource.isCacheable());
+    }
+
     private static class MockResource extends Resource<Object> {
         int recycled = 0;
         @Override
diff --git a/library/src/test/java/com/bumptech/glide/load/engine/SourceResourceRunnerTest.java b/library/src/test/java/com/bumptech/glide/load/engine/SourceResourceRunnerTest.java
index 8f56bbef8a9e174d46b1ca3ac7f706f1a801f093..f92de0030bcddae9c1d8f5941db5922d0f4a8729 100644
--- a/library/src/test/java/com/bumptech/glide/load/engine/SourceResourceRunnerTest.java
+++ b/library/src/test/java/com/bumptech/glide/load/engine/SourceResourceRunnerTest.java
@@ -1,7 +1,6 @@
 package com.bumptech.glide.load.engine;
 
 import com.bumptech.glide.Priority;
-import com.bumptech.glide.Resource;
 import com.bumptech.glide.load.Key;
 import com.bumptech.glide.load.ResourceDecoder;
 import com.bumptech.glide.load.ResourceEncoder;
diff --git a/library/src/test/java/com/bumptech/glide/load/engine/cache/LruResourceCacheTest.java b/library/src/test/java/com/bumptech/glide/load/engine/cache/LruResourceCacheTest.java
index 96e2714dede73d09d580508ad4f27b86ca9b9c36..752c03837322ae224602305e07b6a561e2a403e6 100644
--- a/library/src/test/java/com/bumptech/glide/load/engine/cache/LruResourceCacheTest.java
+++ b/library/src/test/java/com/bumptech/glide/load/engine/cache/LruResourceCacheTest.java
@@ -2,7 +2,7 @@ package com.bumptech.glide.load.engine.cache;
 
 import android.content.ComponentCallbacks2;
 import com.bumptech.glide.load.Key;
-import com.bumptech.glide.Resource;
+import com.bumptech.glide.load.engine.Resource;
 import org.junit.Test;
 
 import java.io.UnsupportedEncodingException;
diff --git a/library/src/test/java/com/bumptech/glide/load/resource/bitmap/BitmapEncoderTest.java b/library/src/test/java/com/bumptech/glide/load/resource/bitmap/BitmapEncoderTest.java
index 760e71885f31bddf8813fb0d11daa9795f055b04..085754b7cf5edcdca52f2832e2b4bd17ec090bd2 100644
--- a/library/src/test/java/com/bumptech/glide/load/resource/bitmap/BitmapEncoderTest.java
+++ b/library/src/test/java/com/bumptech/glide/load/resource/bitmap/BitmapEncoderTest.java
@@ -1,7 +1,7 @@
 package com.bumptech.glide.load.resource.bitmap;
 
 import android.graphics.Bitmap;
-import com.bumptech.glide.Resource;
+import com.bumptech.glide.load.engine.Resource;
 import com.bumptech.glide.tests.Util;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/library/src/test/java/com/bumptech/glide/load/resource/bitmap/CenterCropTest.java b/library/src/test/java/com/bumptech/glide/load/resource/bitmap/CenterCropTest.java
index 8a8b3001201a9041f1faa30ba9d238b7d7579f2f..65624f26b300938de3dd52fd49cb2207d970081e 100644
--- a/library/src/test/java/com/bumptech/glide/load/resource/bitmap/CenterCropTest.java
+++ b/library/src/test/java/com/bumptech/glide/load/resource/bitmap/CenterCropTest.java
@@ -1,7 +1,7 @@
 package com.bumptech.glide.load.resource.bitmap;
 
 import android.graphics.Bitmap;
-import com.bumptech.glide.Resource;
+import com.bumptech.glide.load.engine.Resource;
 import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool;
 import com.bumptech.glide.tests.Util;
 import org.junit.Before;
diff --git a/library/src/test/java/com/bumptech/glide/load/resource/bitmap/FitCenterTest.java b/library/src/test/java/com/bumptech/glide/load/resource/bitmap/FitCenterTest.java
index 396768fd49c7e6d1a41dc0fbb135225daa232b56..c2d857a4688b3b9d76e1b0a24744c9dc327a0b4d 100644
--- a/library/src/test/java/com/bumptech/glide/load/resource/bitmap/FitCenterTest.java
+++ b/library/src/test/java/com/bumptech/glide/load/resource/bitmap/FitCenterTest.java
@@ -1,7 +1,7 @@
 package com.bumptech.glide.load.resource.bitmap;
 
 import android.graphics.Bitmap;
-import com.bumptech.glide.Resource;
+import com.bumptech.glide.load.engine.Resource;
 import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool;
 import com.bumptech.glide.tests.Util;
 import org.junit.Before;
diff --git a/library/src/test/java/com/bumptech/glide/load/resource/bitmap/ImageVideoBitmapDecoderTest.java b/library/src/test/java/com/bumptech/glide/load/resource/bitmap/ImageVideoBitmapDecoderTest.java
index d16fd78397afdee6064cd174946c4c9c354691c3..d0fd7ffe42f80c6189d94da9121a6d31bb738ce8 100644
--- a/library/src/test/java/com/bumptech/glide/load/resource/bitmap/ImageVideoBitmapDecoderTest.java
+++ b/library/src/test/java/com/bumptech/glide/load/resource/bitmap/ImageVideoBitmapDecoderTest.java
@@ -2,7 +2,7 @@ package com.bumptech.glide.load.resource.bitmap;
 
 import android.graphics.Bitmap;
 import android.os.ParcelFileDescriptor;
-import com.bumptech.glide.Resource;
+import com.bumptech.glide.load.engine.Resource;
 import com.bumptech.glide.load.ResourceDecoder;
 import com.bumptech.glide.load.model.ImageVideoWrapper;
 import com.bumptech.glide.tests.Util;
diff --git a/library/src/test/java/com/bumptech/glide/load/resource/bitmap/StreamBitmapDecoderTest.java b/library/src/test/java/com/bumptech/glide/load/resource/bitmap/StreamBitmapDecoderTest.java
index 35d93a237db870d0a56d98baa79590b2a765364a..086a319967a5c435af46c78032b91de7aa2fd830 100644
--- a/library/src/test/java/com/bumptech/glide/load/resource/bitmap/StreamBitmapDecoderTest.java
+++ b/library/src/test/java/com/bumptech/glide/load/resource/bitmap/StreamBitmapDecoderTest.java
@@ -1,7 +1,7 @@
 package com.bumptech.glide.load.resource.bitmap;
 
 import android.graphics.Bitmap;
-import com.bumptech.glide.Resource;
+import com.bumptech.glide.load.engine.Resource;
 import com.bumptech.glide.load.DecodeFormat;
 import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool;
 import com.bumptech.glide.tests.Util;
diff --git a/library/src/test/java/com/bumptech/glide/load/resource/gif/GifDataTransformationTest.java b/library/src/test/java/com/bumptech/glide/load/resource/gif/GifDataTransformationTest.java
index e2e345cf224a2225e028f384888cf15258fc32b9..be97142f97b3a41f32ed95eb7b727429126416e0 100644
--- a/library/src/test/java/com/bumptech/glide/load/resource/gif/GifDataTransformationTest.java
+++ b/library/src/test/java/com/bumptech/glide/load/resource/gif/GifDataTransformationTest.java
@@ -1,7 +1,7 @@
 package com.bumptech.glide.load.resource.gif;
 
 import android.graphics.Bitmap;
-import com.bumptech.glide.Resource;
+import com.bumptech.glide.load.engine.Resource;
 import com.bumptech.glide.load.Transformation;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/library/src/test/java/com/bumptech/glide/load/resource/gif/GifDrawableResourceTest.java b/library/src/test/java/com/bumptech/glide/load/resource/gif/GifDrawableResourceTest.java
index dbce8a3328c2d9be65ad4ff30df8c8a3d24f03dd..8b3fbdead810acc18e8f8775dc761fcb7b24ddcc 100644
--- a/library/src/test/java/com/bumptech/glide/load/resource/gif/GifDrawableResourceTest.java
+++ b/library/src/test/java/com/bumptech/glide/load/resource/gif/GifDrawableResourceTest.java
@@ -1,6 +1,6 @@
 package com.bumptech.glide.load.resource.gif;
 
-import com.bumptech.glide.Resource;
+import com.bumptech.glide.load.engine.Resource;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/library/src/test/java/com/bumptech/glide/load/resource/gif/GifResourceEncoderTest.java b/library/src/test/java/com/bumptech/glide/load/resource/gif/GifResourceEncoderTest.java
index 6199caf56c29c4b547b127b92d0625913d80947b..d71f1eaa5391e89cb7322b1558d31320a16b77ac 100644
--- a/library/src/test/java/com/bumptech/glide/load/resource/gif/GifResourceEncoderTest.java
+++ b/library/src/test/java/com/bumptech/glide/load/resource/gif/GifResourceEncoderTest.java
@@ -1,6 +1,6 @@
 package com.bumptech.glide.load.resource.gif;
 
-import com.bumptech.glide.Resource;
+import com.bumptech.glide.load.engine.Resource;
 import com.bumptech.glide.tests.Util;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/library/src/test/java/com/bumptech/glide/load/resource/gifbitmap/GifBitmapResourceDecoderTest.java b/library/src/test/java/com/bumptech/glide/load/resource/gifbitmap/GifBitmapResourceDecoderTest.java
index 26fc23f656dadadc2aed21f15efa23062011873e..09555d017ba3d1a63415354a759b78630ea09fd8 100644
--- a/library/src/test/java/com/bumptech/glide/load/resource/gifbitmap/GifBitmapResourceDecoderTest.java
+++ b/library/src/test/java/com/bumptech/glide/load/resource/gifbitmap/GifBitmapResourceDecoderTest.java
@@ -2,7 +2,7 @@ package com.bumptech.glide.load.resource.gifbitmap;
 
 import android.graphics.Bitmap;
 import android.os.ParcelFileDescriptor;
-import com.bumptech.glide.Resource;
+import com.bumptech.glide.load.engine.Resource;
 import com.bumptech.glide.load.ResourceDecoder;
 import com.bumptech.glide.load.model.ImageVideoWrapper;
 import com.bumptech.glide.load.resource.gif.GifData;
diff --git a/library/src/test/java/com/bumptech/glide/load/resource/gifbitmap/GifBitmapResourceEncoderTest.java b/library/src/test/java/com/bumptech/glide/load/resource/gifbitmap/GifBitmapResourceEncoderTest.java
index 058049ea68775a48ecd102812b62385b9b73fa95..7147f449634f22af945d715d600f6781501b2b09 100644
--- a/library/src/test/java/com/bumptech/glide/load/resource/gifbitmap/GifBitmapResourceEncoderTest.java
+++ b/library/src/test/java/com/bumptech/glide/load/resource/gifbitmap/GifBitmapResourceEncoderTest.java
@@ -1,7 +1,7 @@
 package com.bumptech.glide.load.resource.gifbitmap;
 
 import android.graphics.Bitmap;
-import com.bumptech.glide.Resource;
+import com.bumptech.glide.load.engine.Resource;
 import com.bumptech.glide.load.ResourceEncoder;
 import com.bumptech.glide.load.resource.gif.GifData;
 import org.junit.Before;
diff --git a/library/src/test/java/com/bumptech/glide/load/resource/gifbitmap/GifBitmapStreamResourceDecoderTest.java b/library/src/test/java/com/bumptech/glide/load/resource/gifbitmap/GifBitmapStreamResourceDecoderTest.java
index bb695335f8d255fb8914edcdfb65f09eb58eb5c6..ddc08bd22b637e3b42faae7b2b9369ebfd19fabd 100644
--- a/library/src/test/java/com/bumptech/glide/load/resource/gifbitmap/GifBitmapStreamResourceDecoderTest.java
+++ b/library/src/test/java/com/bumptech/glide/load/resource/gifbitmap/GifBitmapStreamResourceDecoderTest.java
@@ -1,10 +1,8 @@
 package com.bumptech.glide.load.resource.gifbitmap;
 
-import com.bumptech.glide.Resource;
+import com.bumptech.glide.load.engine.Resource;
 import com.bumptech.glide.load.ResourceDecoder;
 import com.bumptech.glide.load.model.ImageVideoWrapper;
-import com.bumptech.glide.load.resource.gifbitmap.GifBitmapWrapper;
-import com.bumptech.glide.load.resource.gifbitmap.GifBitmapWrapperStreamResourceDecoder;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.invocation.InvocationOnMock;
diff --git a/library/src/test/java/com/bumptech/glide/load/resource/gifbitmap/GifBitmapWrapperResourceTest.java b/library/src/test/java/com/bumptech/glide/load/resource/gifbitmap/GifBitmapWrapperResourceTest.java
index 3f28bbaeed69c2eb0894778ea2175b618d14b244..f0a40674b54c423fd6194b631e1fc4137f3e2788 100644
--- a/library/src/test/java/com/bumptech/glide/load/resource/gifbitmap/GifBitmapWrapperResourceTest.java
+++ b/library/src/test/java/com/bumptech/glide/load/resource/gifbitmap/GifBitmapWrapperResourceTest.java
@@ -1,7 +1,7 @@
 package com.bumptech.glide.load.resource.gifbitmap;
 
 import android.graphics.Bitmap;
-import com.bumptech.glide.Resource;
+import com.bumptech.glide.load.engine.Resource;
 import com.bumptech.glide.load.resource.gif.GifData;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/library/src/test/java/com/bumptech/glide/load/resource/gifbitmap/GifBitmapWrapperTest.java b/library/src/test/java/com/bumptech/glide/load/resource/gifbitmap/GifBitmapWrapperTest.java
index 6cf0c5c8e430ecb4b2c58ab6a4d002e3bf342c0d..057a974adc874fc8fc716174869c206b2819de53 100644
--- a/library/src/test/java/com/bumptech/glide/load/resource/gifbitmap/GifBitmapWrapperTest.java
+++ b/library/src/test/java/com/bumptech/glide/load/resource/gifbitmap/GifBitmapWrapperTest.java
@@ -1,7 +1,7 @@
 package com.bumptech.glide.load.resource.gifbitmap;
 
 import android.graphics.Bitmap;
-import com.bumptech.glide.Resource;
+import com.bumptech.glide.load.engine.Resource;
 import com.bumptech.glide.load.resource.gif.GifData;
 import org.junit.Test;
 
diff --git a/library/src/test/java/com/bumptech/glide/load/resource/gifbitmap/GifBitmapWrapperTransformationTest.java b/library/src/test/java/com/bumptech/glide/load/resource/gifbitmap/GifBitmapWrapperTransformationTest.java
index bd4f3de9d05531bdbef2300bba6282b644c11e79..1a79dd2e5ad45d04b64976993d4e76a27259d8c3 100644
--- a/library/src/test/java/com/bumptech/glide/load/resource/gifbitmap/GifBitmapWrapperTransformationTest.java
+++ b/library/src/test/java/com/bumptech/glide/load/resource/gifbitmap/GifBitmapWrapperTransformationTest.java
@@ -1,7 +1,7 @@
 package com.bumptech.glide.load.resource.gifbitmap;
 
 import android.graphics.Bitmap;
-import com.bumptech.glide.Resource;
+import com.bumptech.glide.load.engine.Resource;
 import com.bumptech.glide.load.Transformation;
 import com.bumptech.glide.load.resource.gif.GifData;
 import org.junit.Before;
diff --git a/library/src/test/java/com/bumptech/glide/load/resource/transcode/BitmapBytesTranscoderTest.java b/library/src/test/java/com/bumptech/glide/load/resource/transcode/BitmapBytesTranscoderTest.java
index aebbe5235a57b50790534ec09b38aa968132a67f..55406507681289858cb8ae5f4d695bba60337a4b 100644
--- a/library/src/test/java/com/bumptech/glide/load/resource/transcode/BitmapBytesTranscoderTest.java
+++ b/library/src/test/java/com/bumptech/glide/load/resource/transcode/BitmapBytesTranscoderTest.java
@@ -1,7 +1,7 @@
 package com.bumptech.glide.load.resource.transcode;
 
 import android.graphics.Bitmap;
-import com.bumptech.glide.Resource;
+import com.bumptech.glide.load.engine.Resource;
 import com.bumptech.glide.tests.Util;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/library/src/test/java/com/bumptech/glide/load/resource/transcode/BitmapDrawableTranscoderTest.java b/library/src/test/java/com/bumptech/glide/load/resource/transcode/BitmapDrawableTranscoderTest.java
index d2cd6a405ebe0034a84ec96566dcae445d605e9f..03d0d96a0ef9b277cdc28229888171c1de0c148a 100644
--- a/library/src/test/java/com/bumptech/glide/load/resource/transcode/BitmapDrawableTranscoderTest.java
+++ b/library/src/test/java/com/bumptech/glide/load/resource/transcode/BitmapDrawableTranscoderTest.java
@@ -2,7 +2,7 @@ package com.bumptech.glide.load.resource.transcode;
 
 import android.graphics.Bitmap;
 import android.graphics.drawable.BitmapDrawable;
-import com.bumptech.glide.Resource;
+import com.bumptech.glide.load.engine.Resource;
 import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool;
 import com.bumptech.glide.tests.Util;
 import org.junit.Test;
diff --git a/library/src/test/java/com/bumptech/glide/load/resource/transcode/GifBitmapWrapperDrawableTranscoderTest.java b/library/src/test/java/com/bumptech/glide/load/resource/transcode/GifBitmapWrapperDrawableTranscoderTest.java
index 7c0b504aa5eb42e129478cc8dfcea1d48df88310..f02b868af920bd54a74533763fc832bbb7915a3f 100644
--- a/library/src/test/java/com/bumptech/glide/load/resource/transcode/GifBitmapWrapperDrawableTranscoderTest.java
+++ b/library/src/test/java/com/bumptech/glide/load/resource/transcode/GifBitmapWrapperDrawableTranscoderTest.java
@@ -2,7 +2,7 @@ package com.bumptech.glide.load.resource.transcode;
 
 import android.graphics.Bitmap;
 import android.graphics.drawable.Drawable;
-import com.bumptech.glide.Resource;
+import com.bumptech.glide.load.engine.Resource;
 import com.bumptech.glide.load.resource.gif.GifData;
 import com.bumptech.glide.load.resource.gifbitmap.GifBitmapWrapper;
 import com.bumptech.glide.tests.Util;
diff --git a/library/src/test/java/com/bumptech/glide/load/resource/transcode/GifDataBytesTranscoderTest.java b/library/src/test/java/com/bumptech/glide/load/resource/transcode/GifDataBytesTranscoderTest.java
index 6c0c8d98081960be8875eb17294790a3ebcc448e..c2e5ea84525efccc8777f4ecb7745140fe711c66 100644
--- a/library/src/test/java/com/bumptech/glide/load/resource/transcode/GifDataBytesTranscoderTest.java
+++ b/library/src/test/java/com/bumptech/glide/load/resource/transcode/GifDataBytesTranscoderTest.java
@@ -1,6 +1,6 @@
 package com.bumptech.glide.load.resource.transcode;
 
-import com.bumptech.glide.Resource;
+import com.bumptech.glide.load.engine.Resource;
 import com.bumptech.glide.load.resource.gif.GifData;
 import com.bumptech.glide.tests.Util;
 import org.junit.Before;
diff --git a/library/src/test/java/com/bumptech/glide/load/resource/transcode/GifDataDrawableTranscoderTest.java b/library/src/test/java/com/bumptech/glide/load/resource/transcode/GifDataDrawableTranscoderTest.java
index e54ee8708df6c543fad9f6db57440ba5883a80e8..00ff16168292ff4a8a8ea1d65364d02e61f60ec5 100644
--- a/library/src/test/java/com/bumptech/glide/load/resource/transcode/GifDataDrawableTranscoderTest.java
+++ b/library/src/test/java/com/bumptech/glide/load/resource/transcode/GifDataDrawableTranscoderTest.java
@@ -1,6 +1,6 @@
 package com.bumptech.glide.load.resource.transcode;
 
-import com.bumptech.glide.Resource;
+import com.bumptech.glide.load.engine.Resource;
 import com.bumptech.glide.load.resource.gif.GifData;
 import com.bumptech.glide.load.resource.gif.GifDrawable;
 import com.bumptech.glide.tests.Util;
diff --git a/library/src/test/java/com/bumptech/glide/load/resource/transcode/UnitTranscoderTest.java b/library/src/test/java/com/bumptech/glide/load/resource/transcode/UnitTranscoderTest.java
index 6cca2a532cfda3f90d3a45067eedd7a48bb2046c..e2cff811db4e24c236dcdb1bc88522cb3daeecf9 100644
--- a/library/src/test/java/com/bumptech/glide/load/resource/transcode/UnitTranscoderTest.java
+++ b/library/src/test/java/com/bumptech/glide/load/resource/transcode/UnitTranscoderTest.java
@@ -1,6 +1,6 @@
 package com.bumptech.glide.load.resource.transcode;
 
-import com.bumptech.glide.Resource;
+import com.bumptech.glide.load.engine.Resource;
 import com.bumptech.glide.tests.Util;
 import org.junit.Test;
 
diff --git a/library/src/test/java/com/bumptech/glide/request/GenericRequestTest.java b/library/src/test/java/com/bumptech/glide/request/GenericRequestTest.java
index ac1281d8d382859b0b5d79cb30f9d32ac1f81fdb..2e2d9142fe3c9f263c09f0f837b4bc6612ea00d5 100644
--- a/library/src/test/java/com/bumptech/glide/request/GenericRequestTest.java
+++ b/library/src/test/java/com/bumptech/glide/request/GenericRequestTest.java
@@ -6,7 +6,7 @@ import android.graphics.Color;
 import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
 import com.bumptech.glide.Priority;
-import com.bumptech.glide.Resource;
+import com.bumptech.glide.load.engine.Resource;
 import com.bumptech.glide.load.ResourceDecoder;
 import com.bumptech.glide.load.ResourceEncoder;
 import com.bumptech.glide.load.Transformation;