lottie: initial liquid lottie commit

Signed-off-by: liquid0624 <rjbirnesser@gmail.com>
diff --git a/Android.mk b/Android.mk
index 28247e0..e81e642 100644
--- a/Android.mk
+++ b/Android.mk
@@ -15,7 +15,7 @@
 
 LOCAL_PATH:= $(call my-dir)
 
-# Disable frameworks aoscp for PDK builds instead
+# Disable frameworks liquid for PDK builds instead
 # use prebuilts/sdk/current/
 ifneq ($(TARGET_BUILD_PDK),true)
 # Don't include in unbundled build.
diff --git a/CleanSpec.mk b/CleanSpec.mk
index 5e2112f..acd873f 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -39,8 +39,8 @@
 # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
 # ************************************************
 
-$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/aoscp-support-*)
-#$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/aoscp-support.aidl)
+$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/liquid-support-*)
+#$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/liquid-support.aidl)
 
 # ************************************************
 # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
diff --git a/support/Android.mk b/support/Android.mk
index 52737aa..7e2c86b 100644
--- a/support/Android.mk
+++ b/support/Android.mk
@@ -15,12 +15,12 @@
 
 LOCAL_PATH := $(call my-dir)
 
-SUPPORT_PATH_LOTTIE := java/aoscp/support/lottie
+SUPPORT_PATH_LOTTIE := java/liquid/support/lottie
 
 include $(CLEAR_VARS)
 
 LOCAL_USE_AAPT2 := true
-LOCAL_MODULE := aoscp-support-lottie
+LOCAL_MODULE := liquid-support-lottie
 LOCAL_SDK_VERSION := $(SUPPORT_CURRENT_SDK_VERSION)
 LOCAL_SRC_FILES := $(call all-java-files-under, $(SUPPORT_PATH_LOTTIE))
 LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
diff --git a/support/AndroidManifest.xml b/support/AndroidManifest.xml
index f900f58..1c459d9 100644
--- a/support/AndroidManifest.xml
+++ b/support/AndroidManifest.xml
@@ -1,4 +1,4 @@
-<manifest package="aoscp.support.lottie" >
+<manifest package="liquid.support.lottie" >
 
     <application />
 
diff --git a/support/java/aoscp/support/lottie/animation/content/KeyPathElementContent.java b/support/java/aoscp/support/lottie/animation/content/KeyPathElementContent.java
deleted file mode 100644
index d6b6e55..0000000
--- a/support/java/aoscp/support/lottie/animation/content/KeyPathElementContent.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package aoscp.support.lottie.animation.content;
-
-import aoscp.support.lottie.model.KeyPathElement;
-
-public interface KeyPathElementContent extends KeyPathElement, Content {
-}
diff --git a/support/java/aoscp/support/lottie/animation/content/ModifierContent.java b/support/java/aoscp/support/lottie/animation/content/ModifierContent.java
deleted file mode 100644
index c325489..0000000
--- a/support/java/aoscp/support/lottie/animation/content/ModifierContent.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package aoscp.support.lottie.animation.content;
-
-public interface ModifierContent {
-}
diff --git a/support/java/aoscp/support/lottie/animation/content/PathContent.java b/support/java/aoscp/support/lottie/animation/content/PathContent.java
deleted file mode 100644
index 39370fa..0000000
--- a/support/java/aoscp/support/lottie/animation/content/PathContent.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package aoscp.support.lottie.animation.content;
-
-import android.graphics.Path;
-
-import aoscp.support.lottie.animation.content.Content;
-
-interface PathContent extends Content {
-  Path getPath();
-}
diff --git a/support/java/aoscp/support/lottie/animation/content/package-info.java b/support/java/aoscp/support/lottie/animation/content/package-info.java
deleted file mode 100644
index f8821dc..0000000
--- a/support/java/aoscp/support/lottie/animation/content/package-info.java
+++ /dev/null
@@ -1,6 +0,0 @@
-@RestrictTo(LIBRARY)
-package aoscp.support.lottie.animation.content;
-
-import android.support.annotation.RestrictTo;
-
-import static android.support.annotation.RestrictTo.Scope.LIBRARY;
\ No newline at end of file
diff --git a/support/java/aoscp/support/lottie/animation/keyframe/package-info.java b/support/java/aoscp/support/lottie/animation/keyframe/package-info.java
deleted file mode 100644
index 9c514dc..0000000
--- a/support/java/aoscp/support/lottie/animation/keyframe/package-info.java
+++ /dev/null
@@ -1,6 +0,0 @@
-@RestrictTo(LIBRARY)
-package aoscp.support.lottie.animation.keyframe;
-
-import android.support.annotation.RestrictTo;
-
-import static android.support.annotation.RestrictTo.Scope.LIBRARY;
\ No newline at end of file
diff --git a/support/java/aoscp/support/lottie/animation/package-info.java b/support/java/aoscp/support/lottie/animation/package-info.java
deleted file mode 100644
index c358249..0000000
--- a/support/java/aoscp/support/lottie/animation/package-info.java
+++ /dev/null
@@ -1,6 +0,0 @@
-@RestrictTo(LIBRARY)
-package aoscp.support.lottie.animation;
-
-import android.support.annotation.RestrictTo;
-
-import static android.support.annotation.RestrictTo.Scope.LIBRARY;
\ No newline at end of file
diff --git a/support/java/aoscp/support/lottie/model/animatable/AnimatableGradientColorValue.java b/support/java/aoscp/support/lottie/model/animatable/AnimatableGradientColorValue.java
deleted file mode 100644
index 1eba986..0000000
--- a/support/java/aoscp/support/lottie/model/animatable/AnimatableGradientColorValue.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package aoscp.support.lottie.model.animatable;
-
-import aoscp.support.lottie.value.Keyframe;
-import aoscp.support.lottie.animation.keyframe.BaseKeyframeAnimation;
-import aoscp.support.lottie.animation.keyframe.GradientColorKeyframeAnimation;
-import aoscp.support.lottie.model.content.GradientColor;
-
-import java.util.List;
-
-public class AnimatableGradientColorValue extends BaseAnimatableValue<GradientColor,
-    GradientColor> {
-  public AnimatableGradientColorValue(
-      List<Keyframe<GradientColor>> keyframes) {
-    super(keyframes);
-  }
-
-  @Override public BaseKeyframeAnimation<GradientColor, GradientColor> createAnimation() {
-    return new GradientColorKeyframeAnimation(keyframes);
-  }
-}
diff --git a/support/java/aoscp/support/lottie/model/animatable/AnimatableShapeValue.java b/support/java/aoscp/support/lottie/model/animatable/AnimatableShapeValue.java
deleted file mode 100644
index 837cbd2..0000000
--- a/support/java/aoscp/support/lottie/model/animatable/AnimatableShapeValue.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package aoscp.support.lottie.model.animatable;
-
-import android.graphics.Path;
-
-import aoscp.support.lottie.value.Keyframe;
-import aoscp.support.lottie.animation.keyframe.BaseKeyframeAnimation;
-import aoscp.support.lottie.animation.keyframe.ShapeKeyframeAnimation;
-import aoscp.support.lottie.model.content.ShapeData;
-
-import java.util.List;
-
-public class AnimatableShapeValue extends BaseAnimatableValue<ShapeData, Path> {
-
-  public AnimatableShapeValue(List<Keyframe<ShapeData>> keyframes) {
-    super(keyframes);
-  }
-
-  @Override public BaseKeyframeAnimation<ShapeData, Path> createAnimation() {
-    return new ShapeKeyframeAnimation(keyframes);
-  }
-}
diff --git a/support/java/aoscp/support/lottie/model/animatable/AnimatableValue.java b/support/java/aoscp/support/lottie/model/animatable/AnimatableValue.java
deleted file mode 100644
index 2d85318..0000000
--- a/support/java/aoscp/support/lottie/model/animatable/AnimatableValue.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package aoscp.support.lottie.model.animatable;
-
-import aoscp.support.lottie.animation.keyframe.BaseKeyframeAnimation;
-
-public interface AnimatableValue<K, A> {
-  BaseKeyframeAnimation<K, A> createAnimation();
-}
diff --git a/support/java/aoscp/support/lottie/model/animatable/package-info.java b/support/java/aoscp/support/lottie/model/animatable/package-info.java
deleted file mode 100644
index a6325da..0000000
--- a/support/java/aoscp/support/lottie/model/animatable/package-info.java
+++ /dev/null
@@ -1,6 +0,0 @@
-@RestrictTo(LIBRARY)
-package aoscp.support.lottie.model.animatable;
-
-import android.support.annotation.RestrictTo;
-
-import static android.support.annotation.RestrictTo.Scope.LIBRARY;
\ No newline at end of file
diff --git a/support/java/aoscp/support/lottie/model/content/ContentModel.java b/support/java/aoscp/support/lottie/model/content/ContentModel.java
deleted file mode 100644
index 0293fd0..0000000
--- a/support/java/aoscp/support/lottie/model/content/ContentModel.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package aoscp.support.lottie.model.content;
-
-
-import android.support.annotation.Nullable;
-
-import aoscp.support.lottie.LottieDrawable;
-import aoscp.support.lottie.animation.content.Content;
-import aoscp.support.lottie.model.layer.BaseLayer;
-
-public interface ContentModel {
-  @Nullable Content toContent(LottieDrawable drawable, BaseLayer layer);
-}
diff --git a/support/java/aoscp/support/lottie/model/content/GradientType.java b/support/java/aoscp/support/lottie/model/content/GradientType.java
deleted file mode 100644
index 764a881..0000000
--- a/support/java/aoscp/support/lottie/model/content/GradientType.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package aoscp.support.lottie.model.content;
-
-public enum GradientType {
-  Linear,
-  Radial
-}
diff --git a/support/java/aoscp/support/lottie/model/content/package-info.java b/support/java/aoscp/support/lottie/model/content/package-info.java
deleted file mode 100644
index 7f6bef9..0000000
--- a/support/java/aoscp/support/lottie/model/content/package-info.java
+++ /dev/null
@@ -1,6 +0,0 @@
-@RestrictTo(LIBRARY)
-package aoscp.support.lottie.model.content;
-
-import android.support.annotation.RestrictTo;
-
-import static android.support.annotation.RestrictTo.Scope.LIBRARY;
\ No newline at end of file
diff --git a/support/java/aoscp/support/lottie/model/layer/package-info.java b/support/java/aoscp/support/lottie/model/layer/package-info.java
deleted file mode 100644
index 8f2eac7..0000000
--- a/support/java/aoscp/support/lottie/model/layer/package-info.java
+++ /dev/null
@@ -1,6 +0,0 @@
-@RestrictTo(LIBRARY)
-package aoscp.support.lottie.model.layer;
-
-import android.support.annotation.RestrictTo;
-
-import static android.support.annotation.RestrictTo.Scope.LIBRARY;
\ No newline at end of file
diff --git a/support/java/aoscp/support/lottie/model/package-info.java b/support/java/aoscp/support/lottie/model/package-info.java
deleted file mode 100644
index 1bdd711..0000000
--- a/support/java/aoscp/support/lottie/model/package-info.java
+++ /dev/null
@@ -1,6 +0,0 @@
-@RestrictTo(LIBRARY)
-package aoscp.support.lottie.model;
-
-import android.support.annotation.RestrictTo;
-
-import static android.support.annotation.RestrictTo.Scope.LIBRARY;
\ No newline at end of file
diff --git a/support/java/aoscp/support/lottie/parser/package-info.java b/support/java/aoscp/support/lottie/parser/package-info.java
deleted file mode 100644
index b4ea7f5..0000000
--- a/support/java/aoscp/support/lottie/parser/package-info.java
+++ /dev/null
@@ -1,6 +0,0 @@
-@RestrictTo(LIBRARY)
-package aoscp.support.lottie.parser;
-
-import android.support.annotation.RestrictTo;
-
-import static android.support.annotation.RestrictTo.Scope.LIBRARY;
\ No newline at end of file
diff --git a/support/java/aoscp/support/lottie/Cancellable.java b/support/java/liquid/support/lottie/Cancellable.java
similarity index 62%
rename from support/java/aoscp/support/lottie/Cancellable.java
rename to support/java/liquid/support/lottie/Cancellable.java
index f0ea6dc..84861f8 100644
--- a/support/java/aoscp/support/lottie/Cancellable.java
+++ b/support/java/liquid/support/lottie/Cancellable.java
@@ -1,4 +1,4 @@
-package aoscp.support.lottie;
+package liquid.support.lottie;
 
 public interface Cancellable {
   void cancel();
diff --git a/support/java/aoscp/support/lottie/FontAssetDelegate.java b/support/java/liquid/support/lottie/FontAssetDelegate.java
similarity index 95%
rename from support/java/aoscp/support/lottie/FontAssetDelegate.java
rename to support/java/liquid/support/lottie/FontAssetDelegate.java
index 7403d11..99bd461 100644
--- a/support/java/aoscp/support/lottie/FontAssetDelegate.java
+++ b/support/java/liquid/support/lottie/FontAssetDelegate.java
@@ -1,4 +1,4 @@
-package aoscp.support.lottie;
+package liquid.support.lottie;
 
 import android.graphics.Typeface;
 
diff --git a/support/java/aoscp/support/lottie/ImageAssetDelegate.java b/support/java/liquid/support/lottie/ImageAssetDelegate.java
similarity index 90%
rename from support/java/aoscp/support/lottie/ImageAssetDelegate.java
rename to support/java/liquid/support/lottie/ImageAssetDelegate.java
index 77c2c3f..9deccd3 100644
--- a/support/java/aoscp/support/lottie/ImageAssetDelegate.java
+++ b/support/java/liquid/support/lottie/ImageAssetDelegate.java
@@ -1,4 +1,4 @@
-package aoscp.support.lottie;
+package liquid.support.lottie;
 
 import android.graphics.Bitmap;
 
diff --git a/support/java/aoscp/support/lottie/L.java b/support/java/liquid/support/lottie/L.java
similarity index 97%
rename from support/java/aoscp/support/lottie/L.java
rename to support/java/liquid/support/lottie/L.java
index a9bca09..b32a1ec 100644
--- a/support/java/aoscp/support/lottie/L.java
+++ b/support/java/liquid/support/lottie/L.java
@@ -1,4 +1,4 @@
-package aoscp.support.lottie;
+package liquid.support.lottie;
 
 import android.support.annotation.RestrictTo;
 import android.support.v4.os.TraceCompat;
diff --git a/support/java/aoscp/support/lottie/LottieAnimationView.java b/support/java/liquid/support/lottie/LottieAnimationView.java
similarity index 98%
rename from support/java/aoscp/support/lottie/LottieAnimationView.java
rename to support/java/liquid/support/lottie/LottieAnimationView.java
index f604e72..69302d5 100644
--- a/support/java/aoscp/support/lottie/LottieAnimationView.java
+++ b/support/java/liquid/support/lottie/LottieAnimationView.java
@@ -1,4 +1,4 @@
-package aoscp.support.lottie;
+package liquid.support.lottie;
 
 import android.animation.Animator;
 import android.animation.ValueAnimator;
@@ -22,10 +22,10 @@
 import android.util.Log;
 import android.util.SparseArray;
 
-import aoscp.support.lottie.model.KeyPath;
-import aoscp.support.lottie.value.LottieFrameInfo;
-import aoscp.support.lottie.value.LottieValueCallback;
-import aoscp.support.lottie.value.SimpleLottieValueCallback;
+import liquid.support.lottie.model.KeyPath;
+import liquid.support.lottie.value.LottieFrameInfo;
+import liquid.support.lottie.value.LottieValueCallback;
+import liquid.support.lottie.value.SimpleLottieValueCallback;
 
 import org.json.JSONObject;
 
diff --git a/support/java/aoscp/support/lottie/LottieComposition.java b/support/java/liquid/support/lottie/LottieComposition.java
similarity index 94%
rename from support/java/aoscp/support/lottie/LottieComposition.java
rename to support/java/liquid/support/lottie/LottieComposition.java
index f06f5ae..3e7ba55 100644
--- a/support/java/aoscp/support/lottie/LottieComposition.java
+++ b/support/java/liquid/support/lottie/LottieComposition.java
@@ -1,4 +1,4 @@
-package aoscp.support.lottie;
+package liquid.support.lottie;
 
 import android.content.Context;
 import android.content.res.Resources;
@@ -12,11 +12,11 @@
 import android.util.JsonReader;
 import android.util.Log;
 
-import aoscp.support.lottie.model.Font;
-import aoscp.support.lottie.model.FontCharacter;
-import aoscp.support.lottie.model.layer.Layer;
-import aoscp.support.lottie.parser.AsyncCompositionLoader;
-import aoscp.support.lottie.parser.LottieCompositionParser;
+import liquid.support.lottie.model.Font;
+import liquid.support.lottie.model.FontCharacter;
+import liquid.support.lottie.model.layer.Layer;
+import liquid.support.lottie.parser.AsyncCompositionLoader;
+import liquid.support.lottie.parser.LottieCompositionParser;
 
 import org.json.JSONObject;
 
@@ -30,13 +30,13 @@
 import java.util.List;
 import java.util.Map;
 
-import static aoscp.support.lottie.utils.Utils.closeQuietly;
+import static liquid.support.lottie.utils.Utils.closeQuietly;
 
 /**
  * After Effects/Bodymovin composition model. This is the serialized model from which the
  * animation will be created.
- * It can be used with a {@link aoscp.support.lottie.LottieAnimationView} or
- * {@link aoscp.support.lottie.LottieDrawable}.
+ * It can be used with a {@link liquid.support.lottie.LottieAnimationView} or
+ * {@link liquid.support.lottie.LottieDrawable}.
  */
 public class LottieComposition {
 
diff --git a/support/java/aoscp/support/lottie/LottieDrawable.java b/support/java/liquid/support/lottie/LottieDrawable.java
similarity index 97%
rename from support/java/aoscp/support/lottie/LottieDrawable.java
rename to support/java/liquid/support/lottie/LottieDrawable.java
index 24f1d59..23df1d8 100644
--- a/support/java/aoscp/support/lottie/LottieDrawable.java
+++ b/support/java/liquid/support/lottie/LottieDrawable.java
@@ -1,4 +1,4 @@
-package aoscp.support.lottie;
+package liquid.support.lottie;
 
 import android.animation.Animator;
 import android.animation.ValueAnimator;
@@ -20,16 +20,16 @@
 import android.util.Log;
 import android.view.View;
 
-import aoscp.support.lottie.manager.FontAssetManager;
-import aoscp.support.lottie.manager.ImageAssetManager;
-import aoscp.support.lottie.model.KeyPath;
-import aoscp.support.lottie.model.layer.CompositionLayer;
-import aoscp.support.lottie.parser.LayerParser;
-import aoscp.support.lottie.utils.LottieValueAnimator;
-import aoscp.support.lottie.utils.MiscUtils;
-import aoscp.support.lottie.value.LottieFrameInfo;
-import aoscp.support.lottie.value.LottieValueCallback;
-import aoscp.support.lottie.value.SimpleLottieValueCallback;
+import liquid.support.lottie.manager.FontAssetManager;
+import liquid.support.lottie.manager.ImageAssetManager;
+import liquid.support.lottie.model.KeyPath;
+import liquid.support.lottie.model.layer.CompositionLayer;
+import liquid.support.lottie.parser.LayerParser;
+import liquid.support.lottie.utils.LottieValueAnimator;
+import liquid.support.lottie.utils.MiscUtils;
+import liquid.support.lottie.value.LottieFrameInfo;
+import liquid.support.lottie.value.LottieValueCallback;
+import liquid.support.lottie.value.SimpleLottieValueCallback;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ -45,7 +45,7 @@
  * If there are masks or mattes, then you MUST call {@link #recycleBitmaps()} when you are done
  * or else you will leak bitmaps.
  * <p>
- * It is preferable to use {@link aoscp.support.lottie.LottieAnimationView} when possible because it
+ * It is preferable to use {@link liquid.support.lottie.LottieAnimationView} when possible because it
  * handles bitmap recycling and asynchronous loading
  * of compositions.
  */
diff --git a/support/java/aoscp/support/lottie/LottieImageAsset.java b/support/java/liquid/support/lottie/LottieImageAsset.java
similarity index 96%
rename from support/java/aoscp/support/lottie/LottieImageAsset.java
rename to support/java/liquid/support/lottie/LottieImageAsset.java
index 09cb8eb..463b803 100644
--- a/support/java/aoscp/support/lottie/LottieImageAsset.java
+++ b/support/java/liquid/support/lottie/LottieImageAsset.java
@@ -1,4 +1,4 @@
-package aoscp.support.lottie;
+package liquid.support.lottie;
 
 import android.support.annotation.RestrictTo;
 
diff --git a/support/java/aoscp/support/lottie/LottieProperty.java b/support/java/liquid/support/lottie/LottieProperty.java
similarity index 94%
rename from support/java/aoscp/support/lottie/LottieProperty.java
rename to support/java/liquid/support/lottie/LottieProperty.java
index 6c02084..affb0af 100644
--- a/support/java/aoscp/support/lottie/LottieProperty.java
+++ b/support/java/liquid/support/lottie/LottieProperty.java
@@ -1,10 +1,10 @@
-package aoscp.support.lottie;
+package liquid.support.lottie;
 
 import android.graphics.ColorFilter;
 import android.graphics.PointF;
 
-import aoscp.support.lottie.value.ScaleXY;
-import aoscp.support.lottie.value.LottieValueCallback;
+import liquid.support.lottie.value.ScaleXY;
+import liquid.support.lottie.value.LottieValueCallback;
 
 /**
  * Property values are the same type as the generic type of their corresponding
diff --git a/support/java/aoscp/support/lottie/OnCompositionLoadedListener.java b/support/java/liquid/support/lottie/OnCompositionLoadedListener.java
similarity index 89%
rename from support/java/aoscp/support/lottie/OnCompositionLoadedListener.java
rename to support/java/liquid/support/lottie/OnCompositionLoadedListener.java
index 6f73bd3..b50886a 100644
--- a/support/java/aoscp/support/lottie/OnCompositionLoadedListener.java
+++ b/support/java/liquid/support/lottie/OnCompositionLoadedListener.java
@@ -1,4 +1,4 @@
-package aoscp.support.lottie;
+package liquid.support.lottie;
 
 import android.support.annotation.Nullable;
 
diff --git a/support/java/aoscp/support/lottie/PerformanceTracker.java b/support/java/liquid/support/lottie/PerformanceTracker.java
similarity index 96%
rename from support/java/aoscp/support/lottie/PerformanceTracker.java
rename to support/java/liquid/support/lottie/PerformanceTracker.java
index d1d5770..05634d0 100644
--- a/support/java/aoscp/support/lottie/PerformanceTracker.java
+++ b/support/java/liquid/support/lottie/PerformanceTracker.java
@@ -1,10 +1,10 @@
-package aoscp.support.lottie;
+package liquid.support.lottie;
 
 import android.support.v4.util.ArraySet;
 import android.support.v4.util.Pair;
 import android.util.Log;
 
-import aoscp.support.lottie.utils.MeanCalculator;
+import liquid.support.lottie.utils.MeanCalculator;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/support/java/aoscp/support/lottie/SimpleColorFilter.java b/support/java/liquid/support/lottie/SimpleColorFilter.java
similarity index 95%
rename from support/java/aoscp/support/lottie/SimpleColorFilter.java
rename to support/java/liquid/support/lottie/SimpleColorFilter.java
index 0f9a85a..674b059 100644
--- a/support/java/aoscp/support/lottie/SimpleColorFilter.java
+++ b/support/java/liquid/support/lottie/SimpleColorFilter.java
@@ -1,4 +1,4 @@
-package aoscp.support.lottie;
+package liquid.support.lottie;
 
 import android.graphics.PorterDuff;
 import android.graphics.PorterDuffColorFilter;
diff --git a/support/java/aoscp/support/lottie/TextDelegate.java b/support/java/liquid/support/lottie/TextDelegate.java
similarity index 98%
rename from support/java/aoscp/support/lottie/TextDelegate.java
rename to support/java/liquid/support/lottie/TextDelegate.java
index cd38ae2..985f796 100644
--- a/support/java/aoscp/support/lottie/TextDelegate.java
+++ b/support/java/liquid/support/lottie/TextDelegate.java
@@ -1,4 +1,4 @@
-package aoscp.support.lottie;
+package liquid.support.lottie;
 
 import android.support.annotation.Nullable;
 import android.support.annotation.VisibleForTesting;
diff --git a/support/java/aoscp/support/lottie/animation/content/BaseStrokeContent.java b/support/java/liquid/support/lottie/animation/content/BaseStrokeContent.java
similarity index 93%
rename from support/java/aoscp/support/lottie/animation/content/BaseStrokeContent.java
rename to support/java/liquid/support/lottie/animation/content/BaseStrokeContent.java
index 9b2efa4..c96afb7 100644
--- a/support/java/aoscp/support/lottie/animation/content/BaseStrokeContent.java
+++ b/support/java/liquid/support/lottie/animation/content/BaseStrokeContent.java
@@ -1,4 +1,4 @@
-package aoscp.support.lottie.animation.content;
+package liquid.support.lottie.animation.content;
 
 import android.graphics.Canvas;
 import android.graphics.ColorFilter;
@@ -11,24 +11,24 @@
 import android.support.annotation.CallSuper;
 import android.support.annotation.Nullable;
 
-import aoscp.support.lottie.L;
-import aoscp.support.lottie.LottieDrawable;
-import aoscp.support.lottie.LottieProperty;
-import aoscp.support.lottie.animation.keyframe.BaseKeyframeAnimation;
-import aoscp.support.lottie.animation.keyframe.ValueCallbackKeyframeAnimation;
-import aoscp.support.lottie.model.KeyPath;
-import aoscp.support.lottie.model.animatable.AnimatableFloatValue;
-import aoscp.support.lottie.model.animatable.AnimatableIntegerValue;
-import aoscp.support.lottie.model.content.ShapeTrimPath;
-import aoscp.support.lottie.model.layer.BaseLayer;
-import aoscp.support.lottie.utils.MiscUtils;
-import aoscp.support.lottie.utils.Utils;
-import aoscp.support.lottie.value.LottieValueCallback;
+import liquid.support.lottie.L;
+import liquid.support.lottie.LottieDrawable;
+import liquid.support.lottie.LottieProperty;
+import liquid.support.lottie.animation.keyframe.BaseKeyframeAnimation;
+import liquid.support.lottie.animation.keyframe.ValueCallbackKeyframeAnimation;
+import liquid.support.lottie.model.KeyPath;
+import liquid.support.lottie.model.animatable.AnimatableFloatValue;
+import liquid.support.lottie.model.animatable.AnimatableIntegerValue;
+import liquid.support.lottie.model.content.ShapeTrimPath;
+import liquid.support.lottie.model.layer.BaseLayer;
+import liquid.support.lottie.utils.MiscUtils;
+import liquid.support.lottie.utils.Utils;
+import liquid.support.lottie.value.LottieValueCallback;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import static aoscp.support.lottie.utils.MiscUtils.clamp;
+import static liquid.support.lottie.utils.MiscUtils.clamp;
 
 public abstract class BaseStrokeContent
     implements BaseKeyframeAnimation.AnimationListener, KeyPathElementContent, DrawingContent {
diff --git a/support/java/aoscp/support/lottie/animation/content/Content.java b/support/java/liquid/support/lottie/animation/content/Content.java
similarity index 75%
rename from support/java/aoscp/support/lottie/animation/content/Content.java
rename to support/java/liquid/support/lottie/animation/content/Content.java
index 8ee33ae..cf45425 100644
--- a/support/java/aoscp/support/lottie/animation/content/Content.java
+++ b/support/java/liquid/support/lottie/animation/content/Content.java
@@ -1,4 +1,4 @@
-package aoscp.support.lottie.animation.content;
+package liquid.support.lottie.animation.content;
 
 import java.util.List;
 
diff --git a/support/java/aoscp/support/lottie/animation/content/ContentGroup.java b/support/java/liquid/support/lottie/animation/content/ContentGroup.java
similarity index 91%
rename from support/java/aoscp/support/lottie/animation/content/ContentGroup.java
rename to support/java/liquid/support/lottie/animation/content/ContentGroup.java
index c8b8d5b..4bd3076 100644
--- a/support/java/aoscp/support/lottie/animation/content/ContentGroup.java
+++ b/support/java/liquid/support/lottie/animation/content/ContentGroup.java
@@ -1,4 +1,4 @@
-package aoscp.support.lottie.animation.content;
+package liquid.support.lottie.animation.content;
 
 import android.graphics.Canvas;
 import android.graphics.Matrix;
@@ -6,16 +6,16 @@
 import android.graphics.RectF;
 import android.support.annotation.Nullable;
 
-import aoscp.support.lottie.LottieDrawable;
-import aoscp.support.lottie.animation.keyframe.BaseKeyframeAnimation;
-import aoscp.support.lottie.animation.keyframe.TransformKeyframeAnimation;
-import aoscp.support.lottie.model.KeyPath;
-import aoscp.support.lottie.model.KeyPathElement;
-import aoscp.support.lottie.model.animatable.AnimatableTransform;
-import aoscp.support.lottie.model.content.ContentModel;
-import aoscp.support.lottie.model.content.ShapeGroup;
-import aoscp.support.lottie.model.layer.BaseLayer;
-import aoscp.support.lottie.value.LottieValueCallback;
+import liquid.support.lottie.LottieDrawable;
+import liquid.support.lottie.animation.keyframe.BaseKeyframeAnimation;
+import liquid.support.lottie.animation.keyframe.TransformKeyframeAnimation;
+import liquid.support.lottie.model.KeyPath;
+import liquid.support.lottie.model.KeyPathElement;
+import liquid.support.lottie.model.animatable.AnimatableTransform;
+import liquid.support.lottie.model.content.ContentModel;
+import liquid.support.lottie.model.content.ShapeGroup;
+import liquid.support.lottie.model.layer.BaseLayer;
+import liquid.support.lottie.value.LottieValueCallback;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/support/java/aoscp/support/lottie/animation/content/DrawingContent.java b/support/java/liquid/support/lottie/animation/content/DrawingContent.java
similarity index 84%
rename from support/java/aoscp/support/lottie/animation/content/DrawingContent.java
rename to support/java/liquid/support/lottie/animation/content/DrawingContent.java
index 662236c..571f252 100644
--- a/support/java/aoscp/support/lottie/animation/content/DrawingContent.java
+++ b/support/java/liquid/support/lottie/animation/content/DrawingContent.java
@@ -1,4 +1,4 @@
-package aoscp.support.lottie.animation.content;
+package liquid.support.lottie.animation.content;
 
 import android.graphics.Canvas;
 import android.graphics.Matrix;
diff --git a/support/java/aoscp/support/lottie/animation/content/EllipseContent.java b/support/java/liquid/support/lottie/animation/content/EllipseContent.java
similarity index 87%
rename from support/java/aoscp/support/lottie/animation/content/EllipseContent.java
rename to support/java/liquid/support/lottie/animation/content/EllipseContent.java
index fc4b0cd..118723f 100644
--- a/support/java/aoscp/support/lottie/animation/content/EllipseContent.java
+++ b/support/java/liquid/support/lottie/animation/content/EllipseContent.java
@@ -1,19 +1,19 @@
-package aoscp.support.lottie.animation.content;
+package liquid.support.lottie.animation.content;
 
 import android.graphics.Path;
 import android.graphics.PointF;
 import android.support.annotation.Nullable;
 
-import aoscp.support.lottie.LottieDrawable;
-import aoscp.support.lottie.LottieProperty;
-import aoscp.support.lottie.animation.keyframe.BaseKeyframeAnimation;
-import aoscp.support.lottie.model.KeyPath;
-import aoscp.support.lottie.model.content.CircleShape;
-import aoscp.support.lottie.model.content.ShapeTrimPath;
-import aoscp.support.lottie.model.layer.BaseLayer;
-import aoscp.support.lottie.utils.MiscUtils;
-import aoscp.support.lottie.utils.Utils;
-import aoscp.support.lottie.value.LottieValueCallback;
+import liquid.support.lottie.LottieDrawable;
+import liquid.support.lottie.LottieProperty;
+import liquid.support.lottie.animation.keyframe.BaseKeyframeAnimation;
+import liquid.support.lottie.model.KeyPath;
+import liquid.support.lottie.model.content.CircleShape;
+import liquid.support.lottie.model.content.ShapeTrimPath;
+import liquid.support.lottie.model.layer.BaseLayer;
+import liquid.support.lottie.utils.MiscUtils;
+import liquid.support.lottie.utils.Utils;
+import liquid.support.lottie.value.LottieValueCallback;
 
 import java.util.List;
 
diff --git a/support/java/aoscp/support/lottie/animation/content/FillContent.java b/support/java/liquid/support/lottie/animation/content/FillContent.java
similarity index 86%
rename from support/java/aoscp/support/lottie/animation/content/FillContent.java
rename to support/java/liquid/support/lottie/animation/content/FillContent.java
index cdcec0a..e76dab5 100644
--- a/support/java/aoscp/support/lottie/animation/content/FillContent.java
+++ b/support/java/liquid/support/lottie/animation/content/FillContent.java
@@ -1,4 +1,4 @@
-package aoscp.support.lottie.animation.content;
+package liquid.support.lottie.animation.content;
 
 import android.graphics.Canvas;
 import android.graphics.ColorFilter;
@@ -8,21 +8,21 @@
 import android.graphics.RectF;
 import android.support.annotation.Nullable;
 
-import aoscp.support.lottie.L;
-import aoscp.support.lottie.LottieDrawable;
-import aoscp.support.lottie.LottieProperty;
-import aoscp.support.lottie.animation.keyframe.BaseKeyframeAnimation;
-import aoscp.support.lottie.animation.keyframe.ValueCallbackKeyframeAnimation;
-import aoscp.support.lottie.model.KeyPath;
-import aoscp.support.lottie.model.content.ShapeFill;
-import aoscp.support.lottie.model.layer.BaseLayer;
-import aoscp.support.lottie.utils.MiscUtils;
-import aoscp.support.lottie.value.LottieValueCallback;
+import liquid.support.lottie.L;
+import liquid.support.lottie.LottieDrawable;
+import liquid.support.lottie.LottieProperty;
+import liquid.support.lottie.animation.keyframe.BaseKeyframeAnimation;
+import liquid.support.lottie.animation.keyframe.ValueCallbackKeyframeAnimation;
+import liquid.support.lottie.model.KeyPath;
+import liquid.support.lottie.model.content.ShapeFill;
+import liquid.support.lottie.model.layer.BaseLayer;
+import liquid.support.lottie.utils.MiscUtils;
+import liquid.support.lottie.value.LottieValueCallback;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import static aoscp.support.lottie.utils.MiscUtils.clamp;
+import static liquid.support.lottie.utils.MiscUtils.clamp;
 
 public class FillContent
     implements DrawingContent, BaseKeyframeAnimation.AnimationListener, KeyPathElementContent {
diff --git a/support/java/aoscp/support/lottie/animation/content/GradientFillContent.java b/support/java/liquid/support/lottie/animation/content/GradientFillContent.java
similarity index 90%
rename from support/java/aoscp/support/lottie/animation/content/GradientFillContent.java
rename to support/java/liquid/support/lottie/animation/content/GradientFillContent.java
index da586b8..bf5e862 100644
--- a/support/java/aoscp/support/lottie/animation/content/GradientFillContent.java
+++ b/support/java/liquid/support/lottie/animation/content/GradientFillContent.java
@@ -1,4 +1,4 @@
-package aoscp.support.lottie.animation.content;
+package liquid.support.lottie.animation.content;
 
 import android.graphics.Canvas;
 import android.graphics.ColorFilter;
@@ -13,23 +13,23 @@
 import android.support.annotation.Nullable;
 import android.support.v4.util.LongSparseArray;
 
-import aoscp.support.lottie.L;
-import aoscp.support.lottie.LottieDrawable;
-import aoscp.support.lottie.LottieProperty;
-import aoscp.support.lottie.animation.keyframe.BaseKeyframeAnimation;
-import aoscp.support.lottie.animation.keyframe.ValueCallbackKeyframeAnimation;
-import aoscp.support.lottie.model.KeyPath;
-import aoscp.support.lottie.model.content.GradientColor;
-import aoscp.support.lottie.model.content.GradientFill;
-import aoscp.support.lottie.model.content.GradientType;
-import aoscp.support.lottie.model.layer.BaseLayer;
-import aoscp.support.lottie.utils.MiscUtils;
-import aoscp.support.lottie.value.LottieValueCallback;
+import liquid.support.lottie.L;
+import liquid.support.lottie.LottieDrawable;
+import liquid.support.lottie.LottieProperty;
+import liquid.support.lottie.animation.keyframe.BaseKeyframeAnimation;
+import liquid.support.lottie.animation.keyframe.ValueCallbackKeyframeAnimation;
+import liquid.support.lottie.model.KeyPath;
+import liquid.support.lottie.model.content.GradientColor;
+import liquid.support.lottie.model.content.GradientFill;
+import liquid.support.lottie.model.content.GradientType;
+import liquid.support.lottie.model.layer.BaseLayer;
+import liquid.support.lottie.utils.MiscUtils;
+import liquid.support.lottie.value.LottieValueCallback;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import static aoscp.support.lottie.utils.MiscUtils.clamp;
+import static liquid.support.lottie.utils.MiscUtils.clamp;
 
 public class GradientFillContent
     implements DrawingContent, BaseKeyframeAnimation.AnimationListener, KeyPathElementContent {
diff --git a/support/java/aoscp/support/lottie/animation/content/GradientStrokeContent.java b/support/java/liquid/support/lottie/animation/content/GradientStrokeContent.java
similarity index 92%
rename from support/java/aoscp/support/lottie/animation/content/GradientStrokeContent.java
rename to support/java/liquid/support/lottie/animation/content/GradientStrokeContent.java
index 397d59a..b32d6f2 100644
--- a/support/java/aoscp/support/lottie/animation/content/GradientStrokeContent.java
+++ b/support/java/liquid/support/lottie/animation/content/GradientStrokeContent.java
@@ -1,4 +1,4 @@
-package aoscp.support.lottie.animation.content;
+package liquid.support.lottie.animation.content;
 
 import android.graphics.Canvas;
 import android.graphics.LinearGradient;
@@ -9,12 +9,12 @@
 import android.graphics.Shader;
 import android.support.v4.util.LongSparseArray;
 
-import aoscp.support.lottie.LottieDrawable;
-import aoscp.support.lottie.animation.keyframe.BaseKeyframeAnimation;
-import aoscp.support.lottie.model.content.GradientColor;
-import aoscp.support.lottie.model.content.GradientStroke;
-import aoscp.support.lottie.model.content.GradientType;
-import aoscp.support.lottie.model.layer.BaseLayer;
+import liquid.support.lottie.LottieDrawable;
+import liquid.support.lottie.animation.keyframe.BaseKeyframeAnimation;
+import liquid.support.lottie.model.content.GradientColor;
+import liquid.support.lottie.model.content.GradientStroke;
+import liquid.support.lottie.model.content.GradientType;
+import liquid.support.lottie.model.layer.BaseLayer;
 
 public class GradientStrokeContent extends BaseStrokeContent {
   /**
diff --git a/support/java/aoscp/support/lottie/animation/content/GreedyContent.java b/support/java/liquid/support/lottie/animation/content/GreedyContent.java
similarity index 93%
rename from support/java/aoscp/support/lottie/animation/content/GreedyContent.java
rename to support/java/liquid/support/lottie/animation/content/GreedyContent.java
index 6b8b860..6fe5265 100644
--- a/support/java/aoscp/support/lottie/animation/content/GreedyContent.java
+++ b/support/java/liquid/support/lottie/animation/content/GreedyContent.java
@@ -1,4 +1,4 @@
-package aoscp.support.lottie.animation.content;
+package liquid.support.lottie.animation.content;
 
 import java.util.ListIterator;
 
diff --git a/support/java/liquid/support/lottie/animation/content/KeyPathElementContent.java b/support/java/liquid/support/lottie/animation/content/KeyPathElementContent.java
new file mode 100644
index 0000000..6f95456
--- /dev/null
+++ b/support/java/liquid/support/lottie/animation/content/KeyPathElementContent.java
@@ -0,0 +1,6 @@
+package liquid.support.lottie.animation.content;
+
+import liquid.support.lottie.model.KeyPathElement;
+
+public interface KeyPathElementContent extends KeyPathElement, Content {
+}
diff --git a/support/java/aoscp/support/lottie/animation/content/MergePathsContent.java b/support/java/liquid/support/lottie/animation/content/MergePathsContent.java
similarity index 96%
rename from support/java/aoscp/support/lottie/animation/content/MergePathsContent.java
rename to support/java/liquid/support/lottie/animation/content/MergePathsContent.java
index 222486d..3b99e4e 100644
--- a/support/java/aoscp/support/lottie/animation/content/MergePathsContent.java
+++ b/support/java/liquid/support/lottie/animation/content/MergePathsContent.java
@@ -1,10 +1,10 @@
-package aoscp.support.lottie.animation.content;
+package liquid.support.lottie.animation.content;
 
 import android.annotation.TargetApi;
 import android.graphics.Path;
 import android.os.Build;
 
-import aoscp.support.lottie.model.content.MergePaths;
+import liquid.support.lottie.model.content.MergePaths;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/support/java/liquid/support/lottie/animation/content/ModifierContent.java b/support/java/liquid/support/lottie/animation/content/ModifierContent.java
new file mode 100644
index 0000000..4e70ef3
--- /dev/null
+++ b/support/java/liquid/support/lottie/animation/content/ModifierContent.java
@@ -0,0 +1,4 @@
+package liquid.support.lottie.animation.content;
+
+public interface ModifierContent {
+}
diff --git a/support/java/liquid/support/lottie/animation/content/PathContent.java b/support/java/liquid/support/lottie/animation/content/PathContent.java
new file mode 100644
index 0000000..8acf145
--- /dev/null
+++ b/support/java/liquid/support/lottie/animation/content/PathContent.java
@@ -0,0 +1,9 @@
+package liquid.support.lottie.animation.content;
+
+import android.graphics.Path;
+
+import liquid.support.lottie.animation.content.Content;
+
+interface PathContent extends Content {
+  Path getPath();
+}
diff --git a/support/java/aoscp/support/lottie/animation/content/PolystarContent.java b/support/java/liquid/support/lottie/animation/content/PolystarContent.java
similarity index 95%
rename from support/java/aoscp/support/lottie/animation/content/PolystarContent.java
rename to support/java/liquid/support/lottie/animation/content/PolystarContent.java
index 9d387f6..c403c18 100644
--- a/support/java/aoscp/support/lottie/animation/content/PolystarContent.java
+++ b/support/java/liquid/support/lottie/animation/content/PolystarContent.java
@@ -1,19 +1,19 @@
-package aoscp.support.lottie.animation.content;
+package liquid.support.lottie.animation.content;
 
 import android.graphics.Path;
 import android.graphics.PointF;
 import android.support.annotation.Nullable;
 
-import aoscp.support.lottie.LottieDrawable;
-import aoscp.support.lottie.LottieProperty;
-import aoscp.support.lottie.animation.keyframe.BaseKeyframeAnimation;
-import aoscp.support.lottie.model.KeyPath;
-import aoscp.support.lottie.model.content.PolystarShape;
-import aoscp.support.lottie.model.content.ShapeTrimPath;
-import aoscp.support.lottie.model.layer.BaseLayer;
-import aoscp.support.lottie.utils.MiscUtils;
-import aoscp.support.lottie.utils.Utils;
-import aoscp.support.lottie.value.LottieValueCallback;
+import liquid.support.lottie.LottieDrawable;
+import liquid.support.lottie.LottieProperty;
+import liquid.support.lottie.animation.keyframe.BaseKeyframeAnimation;
+import liquid.support.lottie.model.KeyPath;
+import liquid.support.lottie.model.content.PolystarShape;
+import liquid.support.lottie.model.content.ShapeTrimPath;
+import liquid.support.lottie.model.layer.BaseLayer;
+import liquid.support.lottie.utils.MiscUtils;
+import liquid.support.lottie.utils.Utils;
+import liquid.support.lottie.value.LottieValueCallback;
 
 import java.util.List;
 
diff --git a/support/java/aoscp/support/lottie/animation/content/RectangleContent.java b/support/java/liquid/support/lottie/animation/content/RectangleContent.java
similarity index 89%
rename from support/java/aoscp/support/lottie/animation/content/RectangleContent.java
rename to support/java/liquid/support/lottie/animation/content/RectangleContent.java
index 9e851d2..0a3d17d 100644
--- a/support/java/aoscp/support/lottie/animation/content/RectangleContent.java
+++ b/support/java/liquid/support/lottie/animation/content/RectangleContent.java
@@ -1,19 +1,19 @@
-package aoscp.support.lottie.animation.content;
+package liquid.support.lottie.animation.content;
 
 import android.graphics.Path;
 import android.graphics.PointF;
 import android.graphics.RectF;
 import android.support.annotation.Nullable;
 
-import aoscp.support.lottie.LottieDrawable;
-import aoscp.support.lottie.animation.keyframe.BaseKeyframeAnimation;
-import aoscp.support.lottie.model.KeyPath;
-import aoscp.support.lottie.model.content.RectangleShape;
-import aoscp.support.lottie.model.content.ShapeTrimPath;
-import aoscp.support.lottie.model.layer.BaseLayer;
-import aoscp.support.lottie.utils.MiscUtils;
-import aoscp.support.lottie.utils.Utils;
-import aoscp.support.lottie.value.LottieValueCallback;
+import liquid.support.lottie.LottieDrawable;
+import liquid.support.lottie.animation.keyframe.BaseKeyframeAnimation;
+import liquid.support.lottie.model.KeyPath;
+import liquid.support.lottie.model.content.RectangleShape;
+import liquid.support.lottie.model.content.ShapeTrimPath;
+import liquid.support.lottie.model.layer.BaseLayer;
+import liquid.support.lottie.utils.MiscUtils;
+import liquid.support.lottie.utils.Utils;
+import liquid.support.lottie.value.LottieValueCallback;
 
 import java.util.List;
 
diff --git a/support/java/aoscp/support/lottie/animation/content/RepeaterContent.java b/support/java/liquid/support/lottie/animation/content/RepeaterContent.java
similarity index 89%
rename from support/java/aoscp/support/lottie/animation/content/RepeaterContent.java
rename to support/java/liquid/support/lottie/animation/content/RepeaterContent.java
index 3885666..dc0280b 100644
--- a/support/java/aoscp/support/lottie/animation/content/RepeaterContent.java
+++ b/support/java/liquid/support/lottie/animation/content/RepeaterContent.java
@@ -1,4 +1,4 @@
-package aoscp.support.lottie.animation.content;
+package liquid.support.lottie.animation.content;
 
 import android.graphics.Canvas;
 import android.graphics.Matrix;
@@ -6,15 +6,15 @@
 import android.graphics.RectF;
 import android.support.annotation.Nullable;
 
-import aoscp.support.lottie.LottieDrawable;
-import aoscp.support.lottie.LottieProperty;
-import aoscp.support.lottie.animation.keyframe.BaseKeyframeAnimation;
-import aoscp.support.lottie.animation.keyframe.TransformKeyframeAnimation;
-import aoscp.support.lottie.model.KeyPath;
-import aoscp.support.lottie.model.content.Repeater;
-import aoscp.support.lottie.model.layer.BaseLayer;
-import aoscp.support.lottie.utils.MiscUtils;
-import aoscp.support.lottie.value.LottieValueCallback;
+import liquid.support.lottie.LottieDrawable;
+import liquid.support.lottie.LottieProperty;
+import liquid.support.lottie.animation.keyframe.BaseKeyframeAnimation;
+import liquid.support.lottie.animation.keyframe.TransformKeyframeAnimation;
+import liquid.support.lottie.model.KeyPath;
+import liquid.support.lottie.model.content.Repeater;
+import liquid.support.lottie.model.layer.BaseLayer;
+import liquid.support.lottie.utils.MiscUtils;
+import liquid.support.lottie.value.LottieValueCallback;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/support/java/aoscp/support/lottie/animation/content/ShapeContent.java b/support/java/liquid/support/lottie/animation/content/ShapeContent.java
similarity index 82%
rename from support/java/aoscp/support/lottie/animation/content/ShapeContent.java
rename to support/java/liquid/support/lottie/animation/content/ShapeContent.java
index 45c49d9..c7150fc 100644
--- a/support/java/aoscp/support/lottie/animation/content/ShapeContent.java
+++ b/support/java/liquid/support/lottie/animation/content/ShapeContent.java
@@ -1,14 +1,14 @@
-package aoscp.support.lottie.animation.content;
+package liquid.support.lottie.animation.content;
 
 import android.graphics.Path;
 import android.support.annotation.Nullable;
 
-import aoscp.support.lottie.LottieDrawable;
-import aoscp.support.lottie.animation.keyframe.BaseKeyframeAnimation;
-import aoscp.support.lottie.model.content.ShapePath;
-import aoscp.support.lottie.model.content.ShapeTrimPath;
-import aoscp.support.lottie.model.layer.BaseLayer;
-import aoscp.support.lottie.utils.Utils;
+import liquid.support.lottie.LottieDrawable;
+import liquid.support.lottie.animation.keyframe.BaseKeyframeAnimation;
+import liquid.support.lottie.model.content.ShapePath;
+import liquid.support.lottie.model.content.ShapeTrimPath;
+import liquid.support.lottie.model.layer.BaseLayer;
+import liquid.support.lottie.utils.Utils;
 
 import java.util.List;
 
diff --git a/support/java/aoscp/support/lottie/animation/content/StrokeContent.java b/support/java/liquid/support/lottie/animation/content/StrokeContent.java
similarity index 76%
rename from support/java/aoscp/support/lottie/animation/content/StrokeContent.java
rename to support/java/liquid/support/lottie/animation/content/StrokeContent.java
index f47d582..95eb183 100644
--- a/support/java/aoscp/support/lottie/animation/content/StrokeContent.java
+++ b/support/java/liquid/support/lottie/animation/content/StrokeContent.java
@@ -1,19 +1,19 @@
-package aoscp.support.lottie.animation.content;
+package liquid.support.lottie.animation.content;
 
 import android.graphics.Canvas;
 import android.graphics.ColorFilter;
 import android.graphics.Matrix;
 import android.support.annotation.Nullable;
 
-import aoscp.support.lottie.LottieDrawable;
-import aoscp.support.lottie.LottieProperty;
-import aoscp.support.lottie.animation.keyframe.BaseKeyframeAnimation;
-import aoscp.support.lottie.animation.keyframe.ValueCallbackKeyframeAnimation;
-import aoscp.support.lottie.model.content.ShapeStroke;
-import aoscp.support.lottie.model.layer.BaseLayer;
-import aoscp.support.lottie.value.LottieValueCallback;
+import liquid.support.lottie.LottieDrawable;
+import liquid.support.lottie.LottieProperty;
+import liquid.support.lottie.animation.keyframe.BaseKeyframeAnimation;
+import liquid.support.lottie.animation.keyframe.ValueCallbackKeyframeAnimation;
+import liquid.support.lottie.model.content.ShapeStroke;
+import liquid.support.lottie.model.layer.BaseLayer;
+import liquid.support.lottie.value.LottieValueCallback;
 
-import static aoscp.support.lottie.LottieProperty.STROKE_COLOR;
+import static liquid.support.lottie.LottieProperty.STROKE_COLOR;
 
 public class StrokeContent extends BaseStrokeContent {
 
diff --git a/support/java/aoscp/support/lottie/animation/content/TrimPathContent.java b/support/java/liquid/support/lottie/animation/content/TrimPathContent.java
similarity index 88%
rename from support/java/aoscp/support/lottie/animation/content/TrimPathContent.java
rename to support/java/liquid/support/lottie/animation/content/TrimPathContent.java
index 7251674..225f772 100644
--- a/support/java/aoscp/support/lottie/animation/content/TrimPathContent.java
+++ b/support/java/liquid/support/lottie/animation/content/TrimPathContent.java
@@ -1,8 +1,8 @@
-package aoscp.support.lottie.animation.content;
+package liquid.support.lottie.animation.content;
 
-import aoscp.support.lottie.animation.keyframe.BaseKeyframeAnimation;
-import aoscp.support.lottie.model.content.ShapeTrimPath;
-import aoscp.support.lottie.model.layer.BaseLayer;
+import liquid.support.lottie.animation.keyframe.BaseKeyframeAnimation;
+import liquid.support.lottie.model.content.ShapeTrimPath;
+import liquid.support.lottie.model.layer.BaseLayer;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/support/java/aoscp/support/lottie/manager/package-info.java b/support/java/liquid/support/lottie/animation/content/package-info.java
similarity index 73%
copy from support/java/aoscp/support/lottie/manager/package-info.java
copy to support/java/liquid/support/lottie/animation/content/package-info.java
index a735163..1ad48e8 100644
--- a/support/java/aoscp/support/lottie/manager/package-info.java
+++ b/support/java/liquid/support/lottie/animation/content/package-info.java
@@ -1,5 +1,5 @@
 @RestrictTo(LIBRARY)
-package aoscp.support.lottie.manager;
+package liquid.support.lottie.animation.content;
 
 import android.support.annotation.RestrictTo;
 
diff --git a/support/java/aoscp/support/lottie/animation/keyframe/BaseKeyframeAnimation.java b/support/java/liquid/support/lottie/animation/keyframe/BaseKeyframeAnimation.java
similarity index 96%
rename from support/java/aoscp/support/lottie/animation/keyframe/BaseKeyframeAnimation.java
rename to support/java/liquid/support/lottie/animation/keyframe/BaseKeyframeAnimation.java
index 012cbab..d0db8d0 100644
--- a/support/java/aoscp/support/lottie/animation/keyframe/BaseKeyframeAnimation.java
+++ b/support/java/liquid/support/lottie/animation/keyframe/BaseKeyframeAnimation.java
@@ -1,10 +1,10 @@
-package aoscp.support.lottie.animation.keyframe;
+package liquid.support.lottie.animation.keyframe;
 
 import android.support.annotation.FloatRange;
 import android.support.annotation.Nullable;
 
-import aoscp.support.lottie.value.LottieValueCallback;
-import aoscp.support.lottie.value.Keyframe;
+import liquid.support.lottie.value.LottieValueCallback;
+import liquid.support.lottie.value.Keyframe;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/support/java/aoscp/support/lottie/animation/keyframe/ColorKeyframeAnimation.java b/support/java/liquid/support/lottie/animation/keyframe/ColorKeyframeAnimation.java
similarity index 85%
rename from support/java/aoscp/support/lottie/animation/keyframe/ColorKeyframeAnimation.java
rename to support/java/liquid/support/lottie/animation/keyframe/ColorKeyframeAnimation.java
index 9253655..37e2c22 100644
--- a/support/java/aoscp/support/lottie/animation/keyframe/ColorKeyframeAnimation.java
+++ b/support/java/liquid/support/lottie/animation/keyframe/ColorKeyframeAnimation.java
@@ -1,7 +1,7 @@
-package aoscp.support.lottie.animation.keyframe;
+package liquid.support.lottie.animation.keyframe;
 
-import aoscp.support.lottie.value.Keyframe;
-import aoscp.support.lottie.utils.GammaEvaluator;
+import liquid.support.lottie.value.Keyframe;
+import liquid.support.lottie.utils.GammaEvaluator;
 
 import java.util.List;
 
diff --git a/support/java/aoscp/support/lottie/animation/keyframe/FloatKeyframeAnimation.java b/support/java/liquid/support/lottie/animation/keyframe/FloatKeyframeAnimation.java
similarity index 84%
rename from support/java/aoscp/support/lottie/animation/keyframe/FloatKeyframeAnimation.java
rename to support/java/liquid/support/lottie/animation/keyframe/FloatKeyframeAnimation.java
index c5a0cfa..dd77ddc 100644
--- a/support/java/aoscp/support/lottie/animation/keyframe/FloatKeyframeAnimation.java
+++ b/support/java/liquid/support/lottie/animation/keyframe/FloatKeyframeAnimation.java
@@ -1,7 +1,7 @@
-package aoscp.support.lottie.animation.keyframe;
+package liquid.support.lottie.animation.keyframe;
 
-import aoscp.support.lottie.value.Keyframe;
-import aoscp.support.lottie.utils.MiscUtils;
+import liquid.support.lottie.value.Keyframe;
+import liquid.support.lottie.utils.MiscUtils;
 
 import java.util.List;
 
diff --git a/support/java/aoscp/support/lottie/animation/keyframe/GradientColorKeyframeAnimation.java b/support/java/liquid/support/lottie/animation/keyframe/GradientColorKeyframeAnimation.java
similarity index 81%
rename from support/java/aoscp/support/lottie/animation/keyframe/GradientColorKeyframeAnimation.java
rename to support/java/liquid/support/lottie/animation/keyframe/GradientColorKeyframeAnimation.java
index da6f637..5f42ea9 100644
--- a/support/java/aoscp/support/lottie/animation/keyframe/GradientColorKeyframeAnimation.java
+++ b/support/java/liquid/support/lottie/animation/keyframe/GradientColorKeyframeAnimation.java
@@ -1,7 +1,7 @@
-package aoscp.support.lottie.animation.keyframe;
+package liquid.support.lottie.animation.keyframe;
 
-import aoscp.support.lottie.value.Keyframe;
-import aoscp.support.lottie.model.content.GradientColor;
+import liquid.support.lottie.value.Keyframe;
+import liquid.support.lottie.model.content.GradientColor;
 
 import java.util.List;
 
diff --git a/support/java/aoscp/support/lottie/animation/keyframe/IntegerKeyframeAnimation.java b/support/java/liquid/support/lottie/animation/keyframe/IntegerKeyframeAnimation.java
similarity index 85%
rename from support/java/aoscp/support/lottie/animation/keyframe/IntegerKeyframeAnimation.java
rename to support/java/liquid/support/lottie/animation/keyframe/IntegerKeyframeAnimation.java
index 1d25a0e..1335199 100644
--- a/support/java/aoscp/support/lottie/animation/keyframe/IntegerKeyframeAnimation.java
+++ b/support/java/liquid/support/lottie/animation/keyframe/IntegerKeyframeAnimation.java
@@ -1,7 +1,7 @@
-package aoscp.support.lottie.animation.keyframe;
+package liquid.support.lottie.animation.keyframe;
 
-import aoscp.support.lottie.value.Keyframe;
-import aoscp.support.lottie.utils.MiscUtils;
+import liquid.support.lottie.value.Keyframe;
+import liquid.support.lottie.utils.MiscUtils;
 
 import java.util.List;
 
diff --git a/support/java/aoscp/support/lottie/animation/keyframe/KeyframeAnimation.java b/support/java/liquid/support/lottie/animation/keyframe/KeyframeAnimation.java
similarity index 66%
rename from support/java/aoscp/support/lottie/animation/keyframe/KeyframeAnimation.java
rename to support/java/liquid/support/lottie/animation/keyframe/KeyframeAnimation.java
index 4d3ba56..f5b0b5a 100644
--- a/support/java/aoscp/support/lottie/animation/keyframe/KeyframeAnimation.java
+++ b/support/java/liquid/support/lottie/animation/keyframe/KeyframeAnimation.java
@@ -1,6 +1,6 @@
-package aoscp.support.lottie.animation.keyframe;
+package liquid.support.lottie.animation.keyframe;
 
-import aoscp.support.lottie.value.Keyframe;
+import liquid.support.lottie.value.Keyframe;
 
 import java.util.List;
 
diff --git a/support/java/aoscp/support/lottie/animation/keyframe/MaskKeyframeAnimation.java b/support/java/liquid/support/lottie/animation/keyframe/MaskKeyframeAnimation.java
similarity index 82%
rename from support/java/aoscp/support/lottie/animation/keyframe/MaskKeyframeAnimation.java
rename to support/java/liquid/support/lottie/animation/keyframe/MaskKeyframeAnimation.java
index 3f3b206..124fb23 100644
--- a/support/java/aoscp/support/lottie/animation/keyframe/MaskKeyframeAnimation.java
+++ b/support/java/liquid/support/lottie/animation/keyframe/MaskKeyframeAnimation.java
@@ -1,10 +1,10 @@
-package aoscp.support.lottie.animation.keyframe;
+package liquid.support.lottie.animation.keyframe;
 
 import android.graphics.Path;
 
-import aoscp.support.lottie.model.animatable.AnimatableIntegerValue;
-import aoscp.support.lottie.model.content.Mask;
-import aoscp.support.lottie.model.content.ShapeData;
+import liquid.support.lottie.model.animatable.AnimatableIntegerValue;
+import liquid.support.lottie.model.content.Mask;
+import liquid.support.lottie.model.content.ShapeData;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/support/java/aoscp/support/lottie/animation/keyframe/PathKeyframe.java b/support/java/liquid/support/lottie/animation/keyframe/PathKeyframe.java
similarity index 83%
rename from support/java/aoscp/support/lottie/animation/keyframe/PathKeyframe.java
rename to support/java/liquid/support/lottie/animation/keyframe/PathKeyframe.java
index 3b4abda..5aff954 100644
--- a/support/java/aoscp/support/lottie/animation/keyframe/PathKeyframe.java
+++ b/support/java/liquid/support/lottie/animation/keyframe/PathKeyframe.java
@@ -1,12 +1,12 @@
-package aoscp.support.lottie.animation.keyframe;
+package liquid.support.lottie.animation.keyframe;
 
 import android.graphics.Path;
 import android.graphics.PointF;
 import android.support.annotation.Nullable;
 
-import aoscp.support.lottie.LottieComposition;
-import aoscp.support.lottie.value.Keyframe;
-import aoscp.support.lottie.utils.Utils;
+import liquid.support.lottie.LottieComposition;
+import liquid.support.lottie.value.Keyframe;
+import liquid.support.lottie.utils.Utils;
 
 public class PathKeyframe extends Keyframe<PointF> {
   @Nullable private Path path;
diff --git a/support/java/aoscp/support/lottie/animation/keyframe/PathKeyframeAnimation.java b/support/java/liquid/support/lottie/animation/keyframe/PathKeyframeAnimation.java
similarity index 92%
rename from support/java/aoscp/support/lottie/animation/keyframe/PathKeyframeAnimation.java
rename to support/java/liquid/support/lottie/animation/keyframe/PathKeyframeAnimation.java
index cbf3cb5..4302213 100644
--- a/support/java/aoscp/support/lottie/animation/keyframe/PathKeyframeAnimation.java
+++ b/support/java/liquid/support/lottie/animation/keyframe/PathKeyframeAnimation.java
@@ -1,10 +1,10 @@
-package aoscp.support.lottie.animation.keyframe;
+package liquid.support.lottie.animation.keyframe;
 
 import android.graphics.Path;
 import android.graphics.PathMeasure;
 import android.graphics.PointF;
 
-import aoscp.support.lottie.value.Keyframe;
+import liquid.support.lottie.value.Keyframe;
 
 import java.util.List;
 
diff --git a/support/java/aoscp/support/lottie/animation/keyframe/PointKeyframeAnimation.java b/support/java/liquid/support/lottie/animation/keyframe/PointKeyframeAnimation.java
similarity index 91%
rename from support/java/aoscp/support/lottie/animation/keyframe/PointKeyframeAnimation.java
rename to support/java/liquid/support/lottie/animation/keyframe/PointKeyframeAnimation.java
index 0b695ba..84fe972 100644
--- a/support/java/aoscp/support/lottie/animation/keyframe/PointKeyframeAnimation.java
+++ b/support/java/liquid/support/lottie/animation/keyframe/PointKeyframeAnimation.java
@@ -1,8 +1,8 @@
-package aoscp.support.lottie.animation.keyframe;
+package liquid.support.lottie.animation.keyframe;
 
 import android.graphics.PointF;
 
-import aoscp.support.lottie.value.Keyframe;
+import liquid.support.lottie.value.Keyframe;
 
 import java.util.List;
 
diff --git a/support/java/aoscp/support/lottie/animation/keyframe/ScaleKeyframeAnimation.java b/support/java/liquid/support/lottie/animation/keyframe/ScaleKeyframeAnimation.java
similarity index 84%
rename from support/java/aoscp/support/lottie/animation/keyframe/ScaleKeyframeAnimation.java
rename to support/java/liquid/support/lottie/animation/keyframe/ScaleKeyframeAnimation.java
index 844059d..8fba301 100644
--- a/support/java/aoscp/support/lottie/animation/keyframe/ScaleKeyframeAnimation.java
+++ b/support/java/liquid/support/lottie/animation/keyframe/ScaleKeyframeAnimation.java
@@ -1,8 +1,8 @@
-package aoscp.support.lottie.animation.keyframe;
+package liquid.support.lottie.animation.keyframe;
 
-import aoscp.support.lottie.value.Keyframe;
-import aoscp.support.lottie.value.ScaleXY;
-import aoscp.support.lottie.utils.MiscUtils;
+import liquid.support.lottie.value.Keyframe;
+import liquid.support.lottie.value.ScaleXY;
+import liquid.support.lottie.utils.MiscUtils;
 
 import java.util.List;
 
diff --git a/support/java/aoscp/support/lottie/animation/keyframe/ShapeKeyframeAnimation.java b/support/java/liquid/support/lottie/animation/keyframe/ShapeKeyframeAnimation.java
similarity index 78%
rename from support/java/aoscp/support/lottie/animation/keyframe/ShapeKeyframeAnimation.java
rename to support/java/liquid/support/lottie/animation/keyframe/ShapeKeyframeAnimation.java
index 30b38e6..014ef98 100644
--- a/support/java/aoscp/support/lottie/animation/keyframe/ShapeKeyframeAnimation.java
+++ b/support/java/liquid/support/lottie/animation/keyframe/ShapeKeyframeAnimation.java
@@ -1,10 +1,10 @@
-package aoscp.support.lottie.animation.keyframe;
+package liquid.support.lottie.animation.keyframe;
 
 import android.graphics.Path;
 
-import aoscp.support.lottie.value.Keyframe;
-import aoscp.support.lottie.model.content.ShapeData;
-import aoscp.support.lottie.utils.MiscUtils;
+import liquid.support.lottie.value.Keyframe;
+import liquid.support.lottie.model.content.ShapeData;
+import liquid.support.lottie.utils.MiscUtils;
 
 import java.util.List;
 
diff --git a/support/java/aoscp/support/lottie/animation/keyframe/SplitDimensionPathKeyframeAnimation.java b/support/java/liquid/support/lottie/animation/keyframe/SplitDimensionPathKeyframeAnimation.java
similarity index 92%
rename from support/java/aoscp/support/lottie/animation/keyframe/SplitDimensionPathKeyframeAnimation.java
rename to support/java/liquid/support/lottie/animation/keyframe/SplitDimensionPathKeyframeAnimation.java
index 23b6d56..c7c664d 100644
--- a/support/java/aoscp/support/lottie/animation/keyframe/SplitDimensionPathKeyframeAnimation.java
+++ b/support/java/liquid/support/lottie/animation/keyframe/SplitDimensionPathKeyframeAnimation.java
@@ -1,8 +1,8 @@
-package aoscp.support.lottie.animation.keyframe;
+package liquid.support.lottie.animation.keyframe;
 
 import android.graphics.PointF;
 
-import aoscp.support.lottie.value.Keyframe;
+import liquid.support.lottie.value.Keyframe;
 
 import java.util.Collections;
 
diff --git a/support/java/aoscp/support/lottie/animation/keyframe/TextKeyframeAnimation.java b/support/java/liquid/support/lottie/animation/keyframe/TextKeyframeAnimation.java
similarity index 69%
rename from support/java/aoscp/support/lottie/animation/keyframe/TextKeyframeAnimation.java
rename to support/java/liquid/support/lottie/animation/keyframe/TextKeyframeAnimation.java
index b180dc8..142d678 100644
--- a/support/java/aoscp/support/lottie/animation/keyframe/TextKeyframeAnimation.java
+++ b/support/java/liquid/support/lottie/animation/keyframe/TextKeyframeAnimation.java
@@ -1,7 +1,7 @@
-package aoscp.support.lottie.animation.keyframe;
+package liquid.support.lottie.animation.keyframe;
 
-import aoscp.support.lottie.value.Keyframe;
-import aoscp.support.lottie.model.DocumentData;
+import liquid.support.lottie.value.Keyframe;
+import liquid.support.lottie.model.DocumentData;
 
 import java.util.List;
 
diff --git a/support/java/aoscp/support/lottie/animation/keyframe/TransformKeyframeAnimation.java b/support/java/liquid/support/lottie/animation/keyframe/TransformKeyframeAnimation.java
similarity index 87%
rename from support/java/aoscp/support/lottie/animation/keyframe/TransformKeyframeAnimation.java
rename to support/java/liquid/support/lottie/animation/keyframe/TransformKeyframeAnimation.java
index 55b4e84..e8439e3 100644
--- a/support/java/aoscp/support/lottie/animation/keyframe/TransformKeyframeAnimation.java
+++ b/support/java/liquid/support/lottie/animation/keyframe/TransformKeyframeAnimation.java
@@ -1,21 +1,21 @@
-package aoscp.support.lottie.animation.keyframe;
+package liquid.support.lottie.animation.keyframe;
 
 import android.graphics.Matrix;
 import android.graphics.PointF;
 import android.support.annotation.Nullable;
 
-import aoscp.support.lottie.value.LottieValueCallback;
-import aoscp.support.lottie.value.ScaleXY;
-import aoscp.support.lottie.model.animatable.AnimatableTransform;
-import aoscp.support.lottie.model.layer.BaseLayer;
+import liquid.support.lottie.value.LottieValueCallback;
+import liquid.support.lottie.value.ScaleXY;
+import liquid.support.lottie.model.animatable.AnimatableTransform;
+import liquid.support.lottie.model.layer.BaseLayer;
 
-import static aoscp.support.lottie.LottieProperty.TRANSFORM_ANCHOR_POINT;
-import static aoscp.support.lottie.LottieProperty.TRANSFORM_END_OPACITY;
-import static aoscp.support.lottie.LottieProperty.TRANSFORM_OPACITY;
-import static aoscp.support.lottie.LottieProperty.TRANSFORM_POSITION;
-import static aoscp.support.lottie.LottieProperty.TRANSFORM_ROTATION;
-import static aoscp.support.lottie.LottieProperty.TRANSFORM_SCALE;
-import static aoscp.support.lottie.LottieProperty.TRANSFORM_START_OPACITY;
+import static liquid.support.lottie.LottieProperty.TRANSFORM_ANCHOR_POINT;
+import static liquid.support.lottie.LottieProperty.TRANSFORM_END_OPACITY;
+import static liquid.support.lottie.LottieProperty.TRANSFORM_OPACITY;
+import static liquid.support.lottie.LottieProperty.TRANSFORM_POSITION;
+import static liquid.support.lottie.LottieProperty.TRANSFORM_ROTATION;
+import static liquid.support.lottie.LottieProperty.TRANSFORM_SCALE;
+import static liquid.support.lottie.LottieProperty.TRANSFORM_START_OPACITY;
 
 public class TransformKeyframeAnimation {
   private final Matrix matrix = new Matrix();
diff --git a/support/java/aoscp/support/lottie/animation/keyframe/ValueCallbackKeyframeAnimation.java b/support/java/liquid/support/lottie/animation/keyframe/ValueCallbackKeyframeAnimation.java
similarity index 82%
rename from support/java/aoscp/support/lottie/animation/keyframe/ValueCallbackKeyframeAnimation.java
rename to support/java/liquid/support/lottie/animation/keyframe/ValueCallbackKeyframeAnimation.java
index bbe8392..7da042f 100644
--- a/support/java/aoscp/support/lottie/animation/keyframe/ValueCallbackKeyframeAnimation.java
+++ b/support/java/liquid/support/lottie/animation/keyframe/ValueCallbackKeyframeAnimation.java
@@ -1,8 +1,8 @@
-package aoscp.support.lottie.animation.keyframe;
+package liquid.support.lottie.animation.keyframe;
 
-import aoscp.support.lottie.value.Keyframe;
-import aoscp.support.lottie.value.LottieFrameInfo;
-import aoscp.support.lottie.value.LottieValueCallback;
+import liquid.support.lottie.value.Keyframe;
+import liquid.support.lottie.value.LottieFrameInfo;
+import liquid.support.lottie.value.LottieValueCallback;
 
 import java.util.Collections;
 
diff --git a/support/java/aoscp/support/lottie/manager/package-info.java b/support/java/liquid/support/lottie/animation/keyframe/package-info.java
similarity index 72%
copy from support/java/aoscp/support/lottie/manager/package-info.java
copy to support/java/liquid/support/lottie/animation/keyframe/package-info.java
index a735163..5d2320c 100644
--- a/support/java/aoscp/support/lottie/manager/package-info.java
+++ b/support/java/liquid/support/lottie/animation/keyframe/package-info.java
@@ -1,5 +1,5 @@
 @RestrictTo(LIBRARY)
-package aoscp.support.lottie.manager;
+package liquid.support.lottie.animation.keyframe;
 
 import android.support.annotation.RestrictTo;
 
diff --git a/support/java/aoscp/support/lottie/manager/package-info.java b/support/java/liquid/support/lottie/animation/package-info.java
similarity index 76%
copy from support/java/aoscp/support/lottie/manager/package-info.java
copy to support/java/liquid/support/lottie/animation/package-info.java
index a735163..2fd0a5b 100644
--- a/support/java/aoscp/support/lottie/manager/package-info.java
+++ b/support/java/liquid/support/lottie/animation/package-info.java
@@ -1,5 +1,5 @@
 @RestrictTo(LIBRARY)
-package aoscp.support.lottie.manager;
+package liquid.support.lottie.animation;
 
 import android.support.annotation.RestrictTo;
 
diff --git a/support/java/aoscp/support/lottie/manager/FontAssetManager.java b/support/java/liquid/support/lottie/manager/FontAssetManager.java
similarity index 94%
rename from support/java/aoscp/support/lottie/manager/FontAssetManager.java
rename to support/java/liquid/support/lottie/manager/FontAssetManager.java
index 890b981..c91c1f9 100644
--- a/support/java/aoscp/support/lottie/manager/FontAssetManager.java
+++ b/support/java/liquid/support/lottie/manager/FontAssetManager.java
@@ -1,4 +1,4 @@
-package aoscp.support.lottie.manager;
+package liquid.support.lottie.manager;
 
 import android.content.res.AssetManager;
 import android.graphics.Typeface;
@@ -7,9 +7,9 @@
 import android.util.Log;
 import android.view.View;
 
-import aoscp.support.lottie.FontAssetDelegate;
-import aoscp.support.lottie.L;
-import aoscp.support.lottie.model.MutablePair;
+import liquid.support.lottie.FontAssetDelegate;
+import liquid.support.lottie.L;
+import liquid.support.lottie.model.MutablePair;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/support/java/aoscp/support/lottie/manager/ImageAssetManager.java b/support/java/liquid/support/lottie/manager/ImageAssetManager.java
similarity index 94%
rename from support/java/aoscp/support/lottie/manager/ImageAssetManager.java
rename to support/java/liquid/support/lottie/manager/ImageAssetManager.java
index 39073da..98dedf0 100644
--- a/support/java/aoscp/support/lottie/manager/ImageAssetManager.java
+++ b/support/java/liquid/support/lottie/manager/ImageAssetManager.java
@@ -1,4 +1,4 @@
-package aoscp.support.lottie.manager;
+package liquid.support.lottie.manager;
 
 import android.content.Context;
 import android.graphics.Bitmap;
@@ -9,9 +9,9 @@
 import android.util.Log;
 import android.view.View;
 
-import aoscp.support.lottie.ImageAssetDelegate;
-import aoscp.support.lottie.L;
-import aoscp.support.lottie.LottieImageAsset;
+import liquid.support.lottie.ImageAssetDelegate;
+import liquid.support.lottie.L;
+import liquid.support.lottie.LottieImageAsset;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/support/java/aoscp/support/lottie/manager/package-info.java b/support/java/liquid/support/lottie/manager/package-info.java
similarity index 77%
copy from support/java/aoscp/support/lottie/manager/package-info.java
copy to support/java/liquid/support/lottie/manager/package-info.java
index a735163..ff6d4f1 100644
--- a/support/java/aoscp/support/lottie/manager/package-info.java
+++ b/support/java/liquid/support/lottie/manager/package-info.java
@@ -1,5 +1,5 @@
 @RestrictTo(LIBRARY)
-package aoscp.support.lottie.manager;
+package liquid.support.lottie.manager;
 
 import android.support.annotation.RestrictTo;
 
diff --git a/support/java/aoscp/support/lottie/model/CubicCurveData.java b/support/java/liquid/support/lottie/model/CubicCurveData.java
similarity index 95%
rename from support/java/aoscp/support/lottie/model/CubicCurveData.java
rename to support/java/liquid/support/lottie/model/CubicCurveData.java
index 60ca7fe..12f5703 100644
--- a/support/java/aoscp/support/lottie/model/CubicCurveData.java
+++ b/support/java/liquid/support/lottie/model/CubicCurveData.java
@@ -1,4 +1,4 @@
-package aoscp.support.lottie.model;
+package liquid.support.lottie.model;
 
 import android.graphics.PointF;
 
diff --git a/support/java/aoscp/support/lottie/model/DocumentData.java b/support/java/liquid/support/lottie/model/DocumentData.java
similarity index 97%
rename from support/java/aoscp/support/lottie/model/DocumentData.java
rename to support/java/liquid/support/lottie/model/DocumentData.java
index 9378e5d..c35af8a 100644
--- a/support/java/aoscp/support/lottie/model/DocumentData.java
+++ b/support/java/liquid/support/lottie/model/DocumentData.java
@@ -1,4 +1,4 @@
-package aoscp.support.lottie.model;
+package liquid.support.lottie.model;
 
 import android.support.annotation.ColorInt;
 
diff --git a/support/java/aoscp/support/lottie/model/Font.java b/support/java/liquid/support/lottie/model/Font.java
similarity index 93%
rename from support/java/aoscp/support/lottie/model/Font.java
rename to support/java/liquid/support/lottie/model/Font.java
index 114d233..47410b7 100644
--- a/support/java/aoscp/support/lottie/model/Font.java
+++ b/support/java/liquid/support/lottie/model/Font.java
@@ -1,4 +1,4 @@
-package aoscp.support.lottie.model;
+package liquid.support.lottie.model;
 
 public class Font {
 
diff --git a/support/java/aoscp/support/lottie/model/FontCharacter.java b/support/java/liquid/support/lottie/model/FontCharacter.java
similarity index 92%
rename from support/java/aoscp/support/lottie/model/FontCharacter.java
rename to support/java/liquid/support/lottie/model/FontCharacter.java
index 7342ea2..c90f818 100644
--- a/support/java/aoscp/support/lottie/model/FontCharacter.java
+++ b/support/java/liquid/support/lottie/model/FontCharacter.java
@@ -1,6 +1,6 @@
-package aoscp.support.lottie.model;
+package liquid.support.lottie.model;
 
-import aoscp.support.lottie.model.content.ShapeGroup;
+import liquid.support.lottie.model.content.ShapeGroup;
 
 import java.util.List;
 
diff --git a/support/java/aoscp/support/lottie/model/KeyPath.java b/support/java/liquid/support/lottie/model/KeyPath.java
similarity index 99%
rename from support/java/aoscp/support/lottie/model/KeyPath.java
rename to support/java/liquid/support/lottie/model/KeyPath.java
index b69362b..6228573 100644
--- a/support/java/aoscp/support/lottie/model/KeyPath.java
+++ b/support/java/liquid/support/lottie/model/KeyPath.java
@@ -1,4 +1,4 @@
-package aoscp.support.lottie.model;
+package liquid.support.lottie.model;
 
 import android.support.annotation.CheckResult;
 import android.support.annotation.Nullable;
diff --git a/support/java/aoscp/support/lottie/model/KeyPathElement.java b/support/java/liquid/support/lottie/model/KeyPathElement.java
similarity index 93%
rename from support/java/aoscp/support/lottie/model/KeyPathElement.java
rename to support/java/liquid/support/lottie/model/KeyPathElement.java
index caf8398..76cef2a 100644
--- a/support/java/aoscp/support/lottie/model/KeyPathElement.java
+++ b/support/java/liquid/support/lottie/model/KeyPathElement.java
@@ -1,8 +1,8 @@
-package aoscp.support.lottie.model;
+package liquid.support.lottie.model;
 
 import android.support.annotation.Nullable;
 
-import aoscp.support.lottie.value.LottieValueCallback;
+import liquid.support.lottie.value.LottieValueCallback;
 
 import java.util.List;
 
diff --git a/support/java/aoscp/support/lottie/model/MutablePair.java b/support/java/liquid/support/lottie/model/MutablePair.java
similarity index 97%
rename from support/java/aoscp/support/lottie/model/MutablePair.java
rename to support/java/liquid/support/lottie/model/MutablePair.java
index f79b6c5..e7751f0 100644
--- a/support/java/aoscp/support/lottie/model/MutablePair.java
+++ b/support/java/liquid/support/lottie/model/MutablePair.java
@@ -1,4 +1,4 @@
-package aoscp.support.lottie.model;
+package liquid.support.lottie.model;
 
 import android.support.annotation.Nullable;
 import android.support.v4.util.Pair;
diff --git a/support/java/aoscp/support/lottie/model/animatable/AnimatableColorValue.java b/support/java/liquid/support/lottie/model/animatable/AnimatableColorValue.java
similarity index 60%
rename from support/java/aoscp/support/lottie/model/animatable/AnimatableColorValue.java
rename to support/java/liquid/support/lottie/model/animatable/AnimatableColorValue.java
index aa73132..84431ba 100644
--- a/support/java/aoscp/support/lottie/model/animatable/AnimatableColorValue.java
+++ b/support/java/liquid/support/lottie/model/animatable/AnimatableColorValue.java
@@ -1,8 +1,8 @@
-package aoscp.support.lottie.model.animatable;
+package liquid.support.lottie.model.animatable;
 
-import aoscp.support.lottie.value.Keyframe;
-import aoscp.support.lottie.animation.keyframe.BaseKeyframeAnimation;
-import aoscp.support.lottie.animation.keyframe.ColorKeyframeAnimation;
+import liquid.support.lottie.value.Keyframe;
+import liquid.support.lottie.animation.keyframe.BaseKeyframeAnimation;
+import liquid.support.lottie.animation.keyframe.ColorKeyframeAnimation;
 
 import java.util.List;
 
diff --git a/support/java/aoscp/support/lottie/model/animatable/AnimatableFloatValue.java b/support/java/liquid/support/lottie/model/animatable/AnimatableFloatValue.java
similarity index 62%
rename from support/java/aoscp/support/lottie/model/animatable/AnimatableFloatValue.java
rename to support/java/liquid/support/lottie/model/animatable/AnimatableFloatValue.java
index fd283b7..ea01fea 100644
--- a/support/java/aoscp/support/lottie/model/animatable/AnimatableFloatValue.java
+++ b/support/java/liquid/support/lottie/model/animatable/AnimatableFloatValue.java
@@ -1,8 +1,8 @@
-package aoscp.support.lottie.model.animatable;
+package liquid.support.lottie.model.animatable;
 
-import aoscp.support.lottie.value.Keyframe;
-import aoscp.support.lottie.animation.keyframe.BaseKeyframeAnimation;
-import aoscp.support.lottie.animation.keyframe.FloatKeyframeAnimation;
+import liquid.support.lottie.value.Keyframe;
+import liquid.support.lottie.animation.keyframe.BaseKeyframeAnimation;
+import liquid.support.lottie.animation.keyframe.FloatKeyframeAnimation;
 
 import java.util.List;
 
diff --git a/support/java/liquid/support/lottie/model/animatable/AnimatableGradientColorValue.java b/support/java/liquid/support/lottie/model/animatable/AnimatableGradientColorValue.java
new file mode 100644
index 0000000..386d9d6
--- /dev/null
+++ b/support/java/liquid/support/lottie/model/animatable/AnimatableGradientColorValue.java
@@ -0,0 +1,20 @@
+package liquid.support.lottie.model.animatable;
+
+import liquid.support.lottie.value.Keyframe;
+import liquid.support.lottie.animation.keyframe.BaseKeyframeAnimation;
+import liquid.support.lottie.animation.keyframe.GradientColorKeyframeAnimation;
+import liquid.support.lottie.model.content.GradientColor;
+
+import java.util.List;
+
+public class AnimatableGradientColorValue extends BaseAnimatableValue<GradientColor,
+    GradientColor> {
+  public AnimatableGradientColorValue(
+      List<Keyframe<GradientColor>> keyframes) {
+    super(keyframes);
+  }
+
+  @Override public BaseKeyframeAnimation<GradientColor, GradientColor> createAnimation() {
+    return new GradientColorKeyframeAnimation(keyframes);
+  }
+}
diff --git a/support/java/aoscp/support/lottie/model/animatable/AnimatableIntegerValue.java b/support/java/liquid/support/lottie/model/animatable/AnimatableIntegerValue.java
similarity index 62%
rename from support/java/aoscp/support/lottie/model/animatable/AnimatableIntegerValue.java
rename to support/java/liquid/support/lottie/model/animatable/AnimatableIntegerValue.java
index f970065..76699d5 100644
--- a/support/java/aoscp/support/lottie/model/animatable/AnimatableIntegerValue.java
+++ b/support/java/liquid/support/lottie/model/animatable/AnimatableIntegerValue.java
@@ -1,8 +1,8 @@
-package aoscp.support.lottie.model.animatable;
+package liquid.support.lottie.model.animatable;
 
-import aoscp.support.lottie.value.Keyframe;
-import aoscp.support.lottie.animation.keyframe.BaseKeyframeAnimation;
-import aoscp.support.lottie.animation.keyframe.IntegerKeyframeAnimation;
+import liquid.support.lottie.value.Keyframe;
+import liquid.support.lottie.animation.keyframe.BaseKeyframeAnimation;
+import liquid.support.lottie.animation.keyframe.IntegerKeyframeAnimation;
 
 import java.util.List;
 
diff --git a/support/java/aoscp/support/lottie/model/animatable/AnimatablePathValue.java b/support/java/liquid/support/lottie/model/animatable/AnimatablePathValue.java
similarity index 70%
rename from support/java/aoscp/support/lottie/model/animatable/AnimatablePathValue.java
rename to support/java/liquid/support/lottie/model/animatable/AnimatablePathValue.java
index aa5dcfa..5737df1 100644
--- a/support/java/aoscp/support/lottie/model/animatable/AnimatablePathValue.java
+++ b/support/java/liquid/support/lottie/model/animatable/AnimatablePathValue.java
@@ -1,11 +1,11 @@
-package aoscp.support.lottie.model.animatable;
+package liquid.support.lottie.model.animatable;
 
 import android.graphics.PointF;
 
-import aoscp.support.lottie.value.Keyframe;
-import aoscp.support.lottie.animation.keyframe.BaseKeyframeAnimation;
-import aoscp.support.lottie.animation.keyframe.PathKeyframeAnimation;
-import aoscp.support.lottie.animation.keyframe.PointKeyframeAnimation;
+import liquid.support.lottie.value.Keyframe;
+import liquid.support.lottie.animation.keyframe.BaseKeyframeAnimation;
+import liquid.support.lottie.animation.keyframe.PathKeyframeAnimation;
+import liquid.support.lottie.animation.keyframe.PointKeyframeAnimation;
 
 import java.util.Collections;
 import java.util.List;
diff --git a/support/java/aoscp/support/lottie/model/animatable/AnimatablePointValue.java b/support/java/liquid/support/lottie/model/animatable/AnimatablePointValue.java
similarity index 61%
rename from support/java/aoscp/support/lottie/model/animatable/AnimatablePointValue.java
rename to support/java/liquid/support/lottie/model/animatable/AnimatablePointValue.java
index 5de496b..96dec1a 100644
--- a/support/java/aoscp/support/lottie/model/animatable/AnimatablePointValue.java
+++ b/support/java/liquid/support/lottie/model/animatable/AnimatablePointValue.java
@@ -1,10 +1,10 @@
-package aoscp.support.lottie.model.animatable;
+package liquid.support.lottie.model.animatable;
 
 import android.graphics.PointF;
 
-import aoscp.support.lottie.value.Keyframe;
-import aoscp.support.lottie.animation.keyframe.BaseKeyframeAnimation;
-import aoscp.support.lottie.animation.keyframe.PointKeyframeAnimation;
+import liquid.support.lottie.value.Keyframe;
+import liquid.support.lottie.animation.keyframe.BaseKeyframeAnimation;
+import liquid.support.lottie.animation.keyframe.PointKeyframeAnimation;
 
 import java.util.List;
 
diff --git a/support/java/aoscp/support/lottie/model/animatable/AnimatableScaleValue.java b/support/java/liquid/support/lottie/model/animatable/AnimatableScaleValue.java
similarity index 63%
rename from support/java/aoscp/support/lottie/model/animatable/AnimatableScaleValue.java
rename to support/java/liquid/support/lottie/model/animatable/AnimatableScaleValue.java
index 2b20f04..4824a8c 100644
--- a/support/java/aoscp/support/lottie/model/animatable/AnimatableScaleValue.java
+++ b/support/java/liquid/support/lottie/model/animatable/AnimatableScaleValue.java
@@ -1,9 +1,9 @@
-package aoscp.support.lottie.model.animatable;
+package liquid.support.lottie.model.animatable;
 
-import aoscp.support.lottie.value.Keyframe;
-import aoscp.support.lottie.animation.keyframe.BaseKeyframeAnimation;
-import aoscp.support.lottie.animation.keyframe.ScaleKeyframeAnimation;
-import aoscp.support.lottie.value.ScaleXY;
+import liquid.support.lottie.value.Keyframe;
+import liquid.support.lottie.animation.keyframe.BaseKeyframeAnimation;
+import liquid.support.lottie.animation.keyframe.ScaleKeyframeAnimation;
+import liquid.support.lottie.value.ScaleXY;
 
 import java.util.List;
 
diff --git a/support/java/liquid/support/lottie/model/animatable/AnimatableShapeValue.java b/support/java/liquid/support/lottie/model/animatable/AnimatableShapeValue.java
new file mode 100644
index 0000000..e897292
--- /dev/null
+++ b/support/java/liquid/support/lottie/model/animatable/AnimatableShapeValue.java
@@ -0,0 +1,21 @@
+package liquid.support.lottie.model.animatable;
+
+import android.graphics.Path;
+
+import liquid.support.lottie.value.Keyframe;
+import liquid.support.lottie.animation.keyframe.BaseKeyframeAnimation;
+import liquid.support.lottie.animation.keyframe.ShapeKeyframeAnimation;
+import liquid.support.lottie.model.content.ShapeData;
+
+import java.util.List;
+
+public class AnimatableShapeValue extends BaseAnimatableValue<ShapeData, Path> {
+
+  public AnimatableShapeValue(List<Keyframe<ShapeData>> keyframes) {
+    super(keyframes);
+  }
+
+  @Override public BaseKeyframeAnimation<ShapeData, Path> createAnimation() {
+    return new ShapeKeyframeAnimation(keyframes);
+  }
+}
diff --git a/support/java/aoscp/support/lottie/model/animatable/AnimatableSplitDimensionPathValue.java b/support/java/liquid/support/lottie/model/animatable/AnimatableSplitDimensionPathValue.java
similarity index 78%
rename from support/java/aoscp/support/lottie/model/animatable/AnimatableSplitDimensionPathValue.java
rename to support/java/liquid/support/lottie/model/animatable/AnimatableSplitDimensionPathValue.java
index d55310c..be10fe5 100644
--- a/support/java/aoscp/support/lottie/model/animatable/AnimatableSplitDimensionPathValue.java
+++ b/support/java/liquid/support/lottie/model/animatable/AnimatableSplitDimensionPathValue.java
@@ -1,9 +1,9 @@
-package aoscp.support.lottie.model.animatable;
+package liquid.support.lottie.model.animatable;
 
 import android.graphics.PointF;
 
-import aoscp.support.lottie.animation.keyframe.BaseKeyframeAnimation;
-import aoscp.support.lottie.animation.keyframe.SplitDimensionPathKeyframeAnimation;
+import liquid.support.lottie.animation.keyframe.BaseKeyframeAnimation;
+import liquid.support.lottie.animation.keyframe.SplitDimensionPathKeyframeAnimation;
 
 public class AnimatableSplitDimensionPathValue implements AnimatableValue<PointF, PointF> {
   private final AnimatableFloatValue animatableXDimension;
diff --git a/support/java/aoscp/support/lottie/model/animatable/AnimatableTextFrame.java b/support/java/liquid/support/lottie/model/animatable/AnimatableTextFrame.java
similarity index 61%
rename from support/java/aoscp/support/lottie/model/animatable/AnimatableTextFrame.java
rename to support/java/liquid/support/lottie/model/animatable/AnimatableTextFrame.java
index 95b9747..3b4cfee 100644
--- a/support/java/aoscp/support/lottie/model/animatable/AnimatableTextFrame.java
+++ b/support/java/liquid/support/lottie/model/animatable/AnimatableTextFrame.java
@@ -1,8 +1,8 @@
-package aoscp.support.lottie.model.animatable;
+package liquid.support.lottie.model.animatable;
 
-import aoscp.support.lottie.value.Keyframe;
-import aoscp.support.lottie.animation.keyframe.TextKeyframeAnimation;
-import aoscp.support.lottie.model.DocumentData;
+import liquid.support.lottie.value.Keyframe;
+import liquid.support.lottie.animation.keyframe.TextKeyframeAnimation;
+import liquid.support.lottie.model.DocumentData;
 
 import java.util.List;
 
diff --git a/support/java/aoscp/support/lottie/model/animatable/AnimatableTextProperties.java b/support/java/liquid/support/lottie/model/animatable/AnimatableTextProperties.java
similarity index 92%
rename from support/java/aoscp/support/lottie/model/animatable/AnimatableTextProperties.java
rename to support/java/liquid/support/lottie/model/animatable/AnimatableTextProperties.java
index 9757604..3ad32ff 100644
--- a/support/java/aoscp/support/lottie/model/animatable/AnimatableTextProperties.java
+++ b/support/java/liquid/support/lottie/model/animatable/AnimatableTextProperties.java
@@ -1,4 +1,4 @@
-package aoscp.support.lottie.model.animatable;
+package liquid.support.lottie.model.animatable;
 
 import android.support.annotation.Nullable;
 
diff --git a/support/java/aoscp/support/lottie/model/animatable/AnimatableTransform.java b/support/java/liquid/support/lottie/model/animatable/AnimatableTransform.java
similarity index 84%
rename from support/java/aoscp/support/lottie/model/animatable/AnimatableTransform.java
rename to support/java/liquid/support/lottie/model/animatable/AnimatableTransform.java
index 57418f8..2443eb1 100644
--- a/support/java/aoscp/support/lottie/model/animatable/AnimatableTransform.java
+++ b/support/java/liquid/support/lottie/model/animatable/AnimatableTransform.java
@@ -1,14 +1,14 @@
-package aoscp.support.lottie.model.animatable;
+package liquid.support.lottie.model.animatable;
 
 import android.graphics.PointF;
 import android.support.annotation.Nullable;
 
-import aoscp.support.lottie.LottieDrawable;
-import aoscp.support.lottie.animation.content.Content;
-import aoscp.support.lottie.animation.content.ModifierContent;
-import aoscp.support.lottie.animation.keyframe.TransformKeyframeAnimation;
-import aoscp.support.lottie.model.content.ContentModel;
-import aoscp.support.lottie.model.layer.BaseLayer;
+import liquid.support.lottie.LottieDrawable;
+import liquid.support.lottie.animation.content.Content;
+import liquid.support.lottie.animation.content.ModifierContent;
+import liquid.support.lottie.animation.keyframe.TransformKeyframeAnimation;
+import liquid.support.lottie.model.content.ContentModel;
+import liquid.support.lottie.model.layer.BaseLayer;
 
 public class AnimatableTransform implements ModifierContent, ContentModel {
   private final AnimatablePathValue anchorPoint;
diff --git a/support/java/liquid/support/lottie/model/animatable/AnimatableValue.java b/support/java/liquid/support/lottie/model/animatable/AnimatableValue.java
new file mode 100644
index 0000000..c9cf24a
--- /dev/null
+++ b/support/java/liquid/support/lottie/model/animatable/AnimatableValue.java
@@ -0,0 +1,7 @@
+package liquid.support.lottie.model.animatable;
+
+import liquid.support.lottie.animation.keyframe.BaseKeyframeAnimation;
+
+public interface AnimatableValue<K, A> {
+  BaseKeyframeAnimation<K, A> createAnimation();
+}
diff --git a/support/java/aoscp/support/lottie/model/animatable/BaseAnimatableValue.java b/support/java/liquid/support/lottie/model/animatable/BaseAnimatableValue.java
similarity index 87%
rename from support/java/aoscp/support/lottie/model/animatable/BaseAnimatableValue.java
rename to support/java/liquid/support/lottie/model/animatable/BaseAnimatableValue.java
index 1c2da3b..86a0c46 100644
--- a/support/java/aoscp/support/lottie/model/animatable/BaseAnimatableValue.java
+++ b/support/java/liquid/support/lottie/model/animatable/BaseAnimatableValue.java
@@ -1,6 +1,6 @@
-package aoscp.support.lottie.model.animatable;
+package liquid.support.lottie.model.animatable;
 
-import aoscp.support.lottie.value.Keyframe;
+import liquid.support.lottie.value.Keyframe;
 
 import java.util.Arrays;
 import java.util.Collections;
diff --git a/support/java/aoscp/support/lottie/manager/package-info.java b/support/java/liquid/support/lottie/model/animatable/package-info.java
similarity index 73%
copy from support/java/aoscp/support/lottie/manager/package-info.java
copy to support/java/liquid/support/lottie/model/animatable/package-info.java
index a735163..62a389a 100644
--- a/support/java/aoscp/support/lottie/manager/package-info.java
+++ b/support/java/liquid/support/lottie/model/animatable/package-info.java
@@ -1,5 +1,5 @@
 @RestrictTo(LIBRARY)
-package aoscp.support.lottie.manager;
+package liquid.support.lottie.model.animatable;
 
 import android.support.annotation.RestrictTo;
 
diff --git a/support/java/aoscp/support/lottie/model/content/CircleShape.java b/support/java/liquid/support/lottie/model/content/CircleShape.java
similarity index 69%
rename from support/java/aoscp/support/lottie/model/content/CircleShape.java
rename to support/java/liquid/support/lottie/model/content/CircleShape.java
index f056fe9..74f20a6 100644
--- a/support/java/aoscp/support/lottie/model/content/CircleShape.java
+++ b/support/java/liquid/support/lottie/model/content/CircleShape.java
@@ -1,13 +1,13 @@
-package aoscp.support.lottie.model.content;
+package liquid.support.lottie.model.content;
 
 import android.graphics.PointF;
 
-import aoscp.support.lottie.LottieDrawable;
-import aoscp.support.lottie.animation.content.Content;
-import aoscp.support.lottie.animation.content.EllipseContent;
-import aoscp.support.lottie.model.animatable.AnimatablePointValue;
-import aoscp.support.lottie.model.animatable.AnimatableValue;
-import aoscp.support.lottie.model.layer.BaseLayer;
+import liquid.support.lottie.LottieDrawable;
+import liquid.support.lottie.animation.content.Content;
+import liquid.support.lottie.animation.content.EllipseContent;
+import liquid.support.lottie.model.animatable.AnimatablePointValue;
+import liquid.support.lottie.model.animatable.AnimatableValue;
+import liquid.support.lottie.model.layer.BaseLayer;
 
 public class CircleShape implements ContentModel {
   private final String name;
diff --git a/support/java/liquid/support/lottie/model/content/ContentModel.java b/support/java/liquid/support/lottie/model/content/ContentModel.java
new file mode 100644
index 0000000..e06f45d
--- /dev/null
+++ b/support/java/liquid/support/lottie/model/content/ContentModel.java
@@ -0,0 +1,12 @@
+package liquid.support.lottie.model.content;
+
+
+import android.support.annotation.Nullable;
+
+import liquid.support.lottie.LottieDrawable;
+import liquid.support.lottie.animation.content.Content;
+import liquid.support.lottie.model.layer.BaseLayer;
+
+public interface ContentModel {
+  @Nullable Content toContent(LottieDrawable drawable, BaseLayer layer);
+}
diff --git a/support/java/aoscp/support/lottie/model/content/GradientColor.java b/support/java/liquid/support/lottie/model/content/GradientColor.java
similarity index 86%
rename from support/java/aoscp/support/lottie/model/content/GradientColor.java
rename to support/java/liquid/support/lottie/model/content/GradientColor.java
index 96cf0bf..053e5c0 100644
--- a/support/java/aoscp/support/lottie/model/content/GradientColor.java
+++ b/support/java/liquid/support/lottie/model/content/GradientColor.java
@@ -1,7 +1,7 @@
-package aoscp.support.lottie.model.content;
+package liquid.support.lottie.model.content;
 
-import aoscp.support.lottie.utils.GammaEvaluator;
-import aoscp.support.lottie.utils.MiscUtils;
+import liquid.support.lottie.utils.GammaEvaluator;
+import liquid.support.lottie.utils.MiscUtils;
 
 
 public class GradientColor {
diff --git a/support/java/aoscp/support/lottie/model/content/GradientFill.java b/support/java/liquid/support/lottie/model/content/GradientFill.java
similarity index 78%
rename from support/java/aoscp/support/lottie/model/content/GradientFill.java
rename to support/java/liquid/support/lottie/model/content/GradientFill.java
index 3f432f8..9ed5d81 100644
--- a/support/java/aoscp/support/lottie/model/content/GradientFill.java
+++ b/support/java/liquid/support/lottie/model/content/GradientFill.java
@@ -1,16 +1,16 @@
-package aoscp.support.lottie.model.content;
+package liquid.support.lottie.model.content;
 
 import android.graphics.Path;
 import android.support.annotation.Nullable;
 
-import aoscp.support.lottie.LottieDrawable;
-import aoscp.support.lottie.animation.content.Content;
-import aoscp.support.lottie.animation.content.GradientFillContent;
-import aoscp.support.lottie.model.animatable.AnimatableFloatValue;
-import aoscp.support.lottie.model.animatable.AnimatableGradientColorValue;
-import aoscp.support.lottie.model.animatable.AnimatableIntegerValue;
-import aoscp.support.lottie.model.animatable.AnimatablePointValue;
-import aoscp.support.lottie.model.layer.BaseLayer;
+import liquid.support.lottie.LottieDrawable;
+import liquid.support.lottie.animation.content.Content;
+import liquid.support.lottie.animation.content.GradientFillContent;
+import liquid.support.lottie.model.animatable.AnimatableFloatValue;
+import liquid.support.lottie.model.animatable.AnimatableGradientColorValue;
+import liquid.support.lottie.model.animatable.AnimatableIntegerValue;
+import liquid.support.lottie.model.animatable.AnimatablePointValue;
+import liquid.support.lottie.model.layer.BaseLayer;
 
 public class GradientFill implements ContentModel {
 
diff --git a/support/java/aoscp/support/lottie/model/content/GradientStroke.java b/support/java/liquid/support/lottie/model/content/GradientStroke.java
similarity index 81%
rename from support/java/aoscp/support/lottie/model/content/GradientStroke.java
rename to support/java/liquid/support/lottie/model/content/GradientStroke.java
index 0b50f2f..03bd8b7 100644
--- a/support/java/aoscp/support/lottie/model/content/GradientStroke.java
+++ b/support/java/liquid/support/lottie/model/content/GradientStroke.java
@@ -1,15 +1,15 @@
-package aoscp.support.lottie.model.content;
+package liquid.support.lottie.model.content;
 
 import android.support.annotation.Nullable;
 
-import aoscp.support.lottie.LottieDrawable;
-import aoscp.support.lottie.animation.content.Content;
-import aoscp.support.lottie.animation.content.GradientStrokeContent;
-import aoscp.support.lottie.model.animatable.AnimatableFloatValue;
-import aoscp.support.lottie.model.animatable.AnimatableGradientColorValue;
-import aoscp.support.lottie.model.animatable.AnimatableIntegerValue;
-import aoscp.support.lottie.model.animatable.AnimatablePointValue;
-import aoscp.support.lottie.model.layer.BaseLayer;
+import liquid.support.lottie.LottieDrawable;
+import liquid.support.lottie.animation.content.Content;
+import liquid.support.lottie.animation.content.GradientStrokeContent;
+import liquid.support.lottie.model.animatable.AnimatableFloatValue;
+import liquid.support.lottie.model.animatable.AnimatableGradientColorValue;
+import liquid.support.lottie.model.animatable.AnimatableIntegerValue;
+import liquid.support.lottie.model.animatable.AnimatablePointValue;
+import liquid.support.lottie.model.layer.BaseLayer;
 
 import java.util.List;
 
diff --git a/support/java/liquid/support/lottie/model/content/GradientType.java b/support/java/liquid/support/lottie/model/content/GradientType.java
new file mode 100644
index 0000000..d60bcdc
--- /dev/null
+++ b/support/java/liquid/support/lottie/model/content/GradientType.java
@@ -0,0 +1,6 @@
+package liquid.support.lottie.model.content;
+
+public enum GradientType {
+  Linear,
+  Radial
+}
diff --git a/support/java/aoscp/support/lottie/model/content/Mask.java b/support/java/liquid/support/lottie/model/content/Mask.java
similarity index 77%
rename from support/java/aoscp/support/lottie/model/content/Mask.java
rename to support/java/liquid/support/lottie/model/content/Mask.java
index 65db437..b7792f9 100644
--- a/support/java/aoscp/support/lottie/model/content/Mask.java
+++ b/support/java/liquid/support/lottie/model/content/Mask.java
@@ -1,7 +1,7 @@
-package aoscp.support.lottie.model.content;
+package liquid.support.lottie.model.content;
 
-import aoscp.support.lottie.model.animatable.AnimatableIntegerValue;
-import aoscp.support.lottie.model.animatable.AnimatableShapeValue;
+import liquid.support.lottie.model.animatable.AnimatableIntegerValue;
+import liquid.support.lottie.model.animatable.AnimatableShapeValue;
 
 public class Mask {
   public enum MaskMode {
diff --git a/support/java/aoscp/support/lottie/model/content/MergePaths.java b/support/java/liquid/support/lottie/model/content/MergePaths.java
similarity index 80%
rename from support/java/aoscp/support/lottie/model/content/MergePaths.java
rename to support/java/liquid/support/lottie/model/content/MergePaths.java
index 9c05977..9a9c9ce 100644
--- a/support/java/aoscp/support/lottie/model/content/MergePaths.java
+++ b/support/java/liquid/support/lottie/model/content/MergePaths.java
@@ -1,13 +1,13 @@
-package aoscp.support.lottie.model.content;
+package liquid.support.lottie.model.content;
 
 import android.support.annotation.Nullable;
 import android.util.Log;
 
-import aoscp.support.lottie.L;
-import aoscp.support.lottie.LottieDrawable;
-import aoscp.support.lottie.animation.content.Content;
-import aoscp.support.lottie.animation.content.MergePathsContent;
-import aoscp.support.lottie.model.layer.BaseLayer;
+import liquid.support.lottie.L;
+import liquid.support.lottie.LottieDrawable;
+import liquid.support.lottie.animation.content.Content;
+import liquid.support.lottie.animation.content.MergePathsContent;
+import liquid.support.lottie.model.layer.BaseLayer;
 
 
 public class MergePaths implements ContentModel {
diff --git a/support/java/aoscp/support/lottie/model/content/PolystarShape.java b/support/java/liquid/support/lottie/model/content/PolystarShape.java
similarity index 84%
rename from support/java/aoscp/support/lottie/model/content/PolystarShape.java
rename to support/java/liquid/support/lottie/model/content/PolystarShape.java
index 30e369d..201616e 100644
--- a/support/java/aoscp/support/lottie/model/content/PolystarShape.java
+++ b/support/java/liquid/support/lottie/model/content/PolystarShape.java
@@ -1,13 +1,13 @@
-package aoscp.support.lottie.model.content;
+package liquid.support.lottie.model.content;
 
 import android.graphics.PointF;
 
-import aoscp.support.lottie.LottieDrawable;
-import aoscp.support.lottie.animation.content.Content;
-import aoscp.support.lottie.animation.content.PolystarContent;
-import aoscp.support.lottie.model.animatable.AnimatableFloatValue;
-import aoscp.support.lottie.model.animatable.AnimatableValue;
-import aoscp.support.lottie.model.layer.BaseLayer;
+import liquid.support.lottie.LottieDrawable;
+import liquid.support.lottie.animation.content.Content;
+import liquid.support.lottie.animation.content.PolystarContent;
+import liquid.support.lottie.model.animatable.AnimatableFloatValue;
+import liquid.support.lottie.model.animatable.AnimatableValue;
+import liquid.support.lottie.model.layer.BaseLayer;
 
 public class PolystarShape implements ContentModel {
   public enum Type {
diff --git a/support/java/aoscp/support/lottie/model/content/RectangleShape.java b/support/java/liquid/support/lottie/model/content/RectangleShape.java
similarity index 70%
rename from support/java/aoscp/support/lottie/model/content/RectangleShape.java
rename to support/java/liquid/support/lottie/model/content/RectangleShape.java
index 5ff9b98..6b518c1 100644
--- a/support/java/aoscp/support/lottie/model/content/RectangleShape.java
+++ b/support/java/liquid/support/lottie/model/content/RectangleShape.java
@@ -1,14 +1,14 @@
-package aoscp.support.lottie.model.content;
+package liquid.support.lottie.model.content;
 
 import android.graphics.PointF;
 
-import aoscp.support.lottie.LottieDrawable;
-import aoscp.support.lottie.animation.content.Content;
-import aoscp.support.lottie.animation.content.RectangleContent;
-import aoscp.support.lottie.model.animatable.AnimatableFloatValue;
-import aoscp.support.lottie.model.animatable.AnimatablePointValue;
-import aoscp.support.lottie.model.animatable.AnimatableValue;
-import aoscp.support.lottie.model.layer.BaseLayer;
+import liquid.support.lottie.LottieDrawable;
+import liquid.support.lottie.animation.content.Content;
+import liquid.support.lottie.animation.content.RectangleContent;
+import liquid.support.lottie.model.animatable.AnimatableFloatValue;
+import liquid.support.lottie.model.animatable.AnimatablePointValue;
+import liquid.support.lottie.model.animatable.AnimatableValue;
+import liquid.support.lottie.model.layer.BaseLayer;
 
 public class RectangleShape implements ContentModel {
   private final String name;
diff --git a/support/java/aoscp/support/lottie/model/content/Repeater.java b/support/java/liquid/support/lottie/model/content/Repeater.java
similarity index 69%
rename from support/java/aoscp/support/lottie/model/content/Repeater.java
rename to support/java/liquid/support/lottie/model/content/Repeater.java
index 26f7362..ec62920 100644
--- a/support/java/aoscp/support/lottie/model/content/Repeater.java
+++ b/support/java/liquid/support/lottie/model/content/Repeater.java
@@ -1,13 +1,13 @@
-package aoscp.support.lottie.model.content;
+package liquid.support.lottie.model.content;
 
 import android.support.annotation.Nullable;
 
-import aoscp.support.lottie.LottieDrawable;
-import aoscp.support.lottie.animation.content.Content;
-import aoscp.support.lottie.animation.content.RepeaterContent;
-import aoscp.support.lottie.model.animatable.AnimatableFloatValue;
-import aoscp.support.lottie.model.animatable.AnimatableTransform;
-import aoscp.support.lottie.model.layer.BaseLayer;
+import liquid.support.lottie.LottieDrawable;
+import liquid.support.lottie.animation.content.Content;
+import liquid.support.lottie.animation.content.RepeaterContent;
+import liquid.support.lottie.model.animatable.AnimatableFloatValue;
+import liquid.support.lottie.model.animatable.AnimatableTransform;
+import liquid.support.lottie.model.layer.BaseLayer;
 
 public class Repeater implements ContentModel {
   private final String name;
diff --git a/support/java/aoscp/support/lottie/model/content/ShapeData.java b/support/java/liquid/support/lottie/model/content/ShapeData.java
similarity index 95%
rename from support/java/aoscp/support/lottie/model/content/ShapeData.java
rename to support/java/liquid/support/lottie/model/content/ShapeData.java
index 34db3d9..19f20e4 100644
--- a/support/java/aoscp/support/lottie/model/content/ShapeData.java
+++ b/support/java/liquid/support/lottie/model/content/ShapeData.java
@@ -1,10 +1,10 @@
-package aoscp.support.lottie.model.content;
+package liquid.support.lottie.model.content;
 
 import android.graphics.PointF;
 import android.support.annotation.FloatRange;
 
-import aoscp.support.lottie.model.CubicCurveData;
-import aoscp.support.lottie.utils.MiscUtils;
+import liquid.support.lottie.model.CubicCurveData;
+import liquid.support.lottie.utils.MiscUtils;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/support/java/aoscp/support/lottie/model/content/ShapeFill.java b/support/java/liquid/support/lottie/model/content/ShapeFill.java
similarity index 75%
rename from support/java/aoscp/support/lottie/model/content/ShapeFill.java
rename to support/java/liquid/support/lottie/model/content/ShapeFill.java
index d5f5e0d..f9b91ff 100644
--- a/support/java/aoscp/support/lottie/model/content/ShapeFill.java
+++ b/support/java/liquid/support/lottie/model/content/ShapeFill.java
@@ -1,14 +1,14 @@
-package aoscp.support.lottie.model.content;
+package liquid.support.lottie.model.content;
 
 import android.graphics.Path;
 import android.support.annotation.Nullable;
 
-import aoscp.support.lottie.LottieDrawable;
-import aoscp.support.lottie.animation.content.Content;
-import aoscp.support.lottie.animation.content.FillContent;
-import aoscp.support.lottie.model.animatable.AnimatableColorValue;
-import aoscp.support.lottie.model.animatable.AnimatableIntegerValue;
-import aoscp.support.lottie.model.layer.BaseLayer;
+import liquid.support.lottie.LottieDrawable;
+import liquid.support.lottie.animation.content.Content;
+import liquid.support.lottie.animation.content.FillContent;
+import liquid.support.lottie.model.animatable.AnimatableColorValue;
+import liquid.support.lottie.model.animatable.AnimatableIntegerValue;
+import liquid.support.lottie.model.layer.BaseLayer;
 
 public class ShapeFill implements ContentModel {
   private final boolean fillEnabled;
diff --git a/support/java/aoscp/support/lottie/model/content/ShapeGroup.java b/support/java/liquid/support/lottie/model/content/ShapeGroup.java
similarity index 72%
rename from support/java/aoscp/support/lottie/model/content/ShapeGroup.java
rename to support/java/liquid/support/lottie/model/content/ShapeGroup.java
index 274043f..ac5f4ed 100644
--- a/support/java/aoscp/support/lottie/model/content/ShapeGroup.java
+++ b/support/java/liquid/support/lottie/model/content/ShapeGroup.java
@@ -1,9 +1,9 @@
-package aoscp.support.lottie.model.content;
+package liquid.support.lottie.model.content;
 
-import aoscp.support.lottie.LottieDrawable;
-import aoscp.support.lottie.animation.content.Content;
-import aoscp.support.lottie.animation.content.ContentGroup;
-import aoscp.support.lottie.model.layer.BaseLayer;
+import liquid.support.lottie.LottieDrawable;
+import liquid.support.lottie.animation.content.Content;
+import liquid.support.lottie.animation.content.ContentGroup;
+import liquid.support.lottie.model.layer.BaseLayer;
 
 import java.util.Arrays;
 import java.util.List;
diff --git a/support/java/aoscp/support/lottie/model/content/ShapePath.java b/support/java/liquid/support/lottie/model/content/ShapePath.java
similarity index 68%
rename from support/java/aoscp/support/lottie/model/content/ShapePath.java
rename to support/java/liquid/support/lottie/model/content/ShapePath.java
index fca0632..264de58 100644
--- a/support/java/aoscp/support/lottie/model/content/ShapePath.java
+++ b/support/java/liquid/support/lottie/model/content/ShapePath.java
@@ -1,10 +1,10 @@
-package aoscp.support.lottie.model.content;
+package liquid.support.lottie.model.content;
 
-import aoscp.support.lottie.LottieDrawable;
-import aoscp.support.lottie.animation.content.Content;
-import aoscp.support.lottie.animation.content.ShapeContent;
-import aoscp.support.lottie.model.animatable.AnimatableShapeValue;
-import aoscp.support.lottie.model.layer.BaseLayer;
+import liquid.support.lottie.LottieDrawable;
+import liquid.support.lottie.animation.content.Content;
+import liquid.support.lottie.animation.content.ShapeContent;
+import liquid.support.lottie.model.animatable.AnimatableShapeValue;
+import liquid.support.lottie.model.layer.BaseLayer;
 
 public class ShapePath implements ContentModel {
   private final String name;
diff --git a/support/java/aoscp/support/lottie/model/content/ShapeStroke.java b/support/java/liquid/support/lottie/model/content/ShapeStroke.java
similarity index 83%
rename from support/java/aoscp/support/lottie/model/content/ShapeStroke.java
rename to support/java/liquid/support/lottie/model/content/ShapeStroke.java
index af42ace..145f977 100644
--- a/support/java/aoscp/support/lottie/model/content/ShapeStroke.java
+++ b/support/java/liquid/support/lottie/model/content/ShapeStroke.java
@@ -1,15 +1,15 @@
-package aoscp.support.lottie.model.content;
+package liquid.support.lottie.model.content;
 
 import android.graphics.Paint;
 import android.support.annotation.Nullable;
 
-import aoscp.support.lottie.LottieDrawable;
-import aoscp.support.lottie.animation.content.Content;
-import aoscp.support.lottie.animation.content.StrokeContent;
-import aoscp.support.lottie.model.animatable.AnimatableColorValue;
-import aoscp.support.lottie.model.animatable.AnimatableFloatValue;
-import aoscp.support.lottie.model.animatable.AnimatableIntegerValue;
-import aoscp.support.lottie.model.layer.BaseLayer;
+import liquid.support.lottie.LottieDrawable;
+import liquid.support.lottie.animation.content.Content;
+import liquid.support.lottie.animation.content.StrokeContent;
+import liquid.support.lottie.model.animatable.AnimatableColorValue;
+import liquid.support.lottie.model.animatable.AnimatableFloatValue;
+import liquid.support.lottie.model.animatable.AnimatableIntegerValue;
+import liquid.support.lottie.model.layer.BaseLayer;
 
 import java.util.List;
 
diff --git a/support/java/aoscp/support/lottie/model/content/ShapeTrimPath.java b/support/java/liquid/support/lottie/model/content/ShapeTrimPath.java
similarity index 80%
rename from support/java/aoscp/support/lottie/model/content/ShapeTrimPath.java
rename to support/java/liquid/support/lottie/model/content/ShapeTrimPath.java
index 17b2b5c..21082da 100644
--- a/support/java/aoscp/support/lottie/model/content/ShapeTrimPath.java
+++ b/support/java/liquid/support/lottie/model/content/ShapeTrimPath.java
@@ -1,10 +1,10 @@
-package aoscp.support.lottie.model.content;
+package liquid.support.lottie.model.content;
 
-import aoscp.support.lottie.LottieDrawable;
-import aoscp.support.lottie.animation.content.Content;
-import aoscp.support.lottie.animation.content.TrimPathContent;
-import aoscp.support.lottie.model.animatable.AnimatableFloatValue;
-import aoscp.support.lottie.model.layer.BaseLayer;
+import liquid.support.lottie.LottieDrawable;
+import liquid.support.lottie.animation.content.Content;
+import liquid.support.lottie.animation.content.TrimPathContent;
+import liquid.support.lottie.model.animatable.AnimatableFloatValue;
+import liquid.support.lottie.model.layer.BaseLayer;
 
 public class ShapeTrimPath implements ContentModel {
 
diff --git a/support/java/aoscp/support/lottie/manager/package-info.java b/support/java/liquid/support/lottie/model/content/package-info.java
similarity index 74%
copy from support/java/aoscp/support/lottie/manager/package-info.java
copy to support/java/liquid/support/lottie/model/content/package-info.java
index a735163..cd6e390 100644
--- a/support/java/aoscp/support/lottie/manager/package-info.java
+++ b/support/java/liquid/support/lottie/model/content/package-info.java
@@ -1,5 +1,5 @@
 @RestrictTo(LIBRARY)
-package aoscp.support.lottie.manager;
+package liquid.support.lottie.model.content;
 
 import android.support.annotation.RestrictTo;
 
diff --git a/support/java/aoscp/support/lottie/model/layer/BaseLayer.java b/support/java/liquid/support/lottie/model/layer/BaseLayer.java
similarity index 94%
rename from support/java/aoscp/support/lottie/model/layer/BaseLayer.java
rename to support/java/liquid/support/lottie/model/layer/BaseLayer.java
index 468199c..78375f0 100644
--- a/support/java/aoscp/support/lottie/model/layer/BaseLayer.java
+++ b/support/java/liquid/support/lottie/model/layer/BaseLayer.java
@@ -1,4 +1,4 @@
-package aoscp.support.lottie.model.layer;
+package liquid.support.lottie.model.layer;
 
 import android.annotation.SuppressLint;
 import android.graphics.Canvas;
@@ -13,19 +13,19 @@
 import android.support.annotation.Nullable;
 import android.util.Log;
 
-import aoscp.support.lottie.L;
-import aoscp.support.lottie.LottieComposition;
-import aoscp.support.lottie.LottieDrawable;
-import aoscp.support.lottie.animation.content.Content;
-import aoscp.support.lottie.animation.content.DrawingContent;
-import aoscp.support.lottie.animation.keyframe.BaseKeyframeAnimation;
-import aoscp.support.lottie.animation.keyframe.FloatKeyframeAnimation;
-import aoscp.support.lottie.animation.keyframe.MaskKeyframeAnimation;
-import aoscp.support.lottie.animation.keyframe.TransformKeyframeAnimation;
-import aoscp.support.lottie.model.KeyPath;
-import aoscp.support.lottie.model.KeyPathElement;
-import aoscp.support.lottie.model.content.Mask;
-import aoscp.support.lottie.value.LottieValueCallback;
+import liquid.support.lottie.L;
+import liquid.support.lottie.LottieComposition;
+import liquid.support.lottie.LottieDrawable;
+import liquid.support.lottie.animation.content.Content;
+import liquid.support.lottie.animation.content.DrawingContent;
+import liquid.support.lottie.animation.keyframe.BaseKeyframeAnimation;
+import liquid.support.lottie.animation.keyframe.FloatKeyframeAnimation;
+import liquid.support.lottie.animation.keyframe.MaskKeyframeAnimation;
+import liquid.support.lottie.animation.keyframe.TransformKeyframeAnimation;
+import liquid.support.lottie.model.KeyPath;
+import liquid.support.lottie.model.KeyPathElement;
+import liquid.support.lottie.model.content.Mask;
+import liquid.support.lottie.value.LottieValueCallback;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/support/java/aoscp/support/lottie/model/layer/CompositionLayer.java b/support/java/liquid/support/lottie/model/layer/CompositionLayer.java
similarity index 91%
rename from support/java/aoscp/support/lottie/model/layer/CompositionLayer.java
rename to support/java/liquid/support/lottie/model/layer/CompositionLayer.java
index 81f6687..d0f173c 100644
--- a/support/java/aoscp/support/lottie/model/layer/CompositionLayer.java
+++ b/support/java/liquid/support/lottie/model/layer/CompositionLayer.java
@@ -1,4 +1,4 @@
-package aoscp.support.lottie.model.layer;
+package liquid.support.lottie.model.layer;
 
 import android.graphics.Canvas;
 import android.graphics.Matrix;
@@ -7,15 +7,15 @@
 import android.support.annotation.Nullable;
 import android.support.v4.util.LongSparseArray;
 
-import aoscp.support.lottie.L;
-import aoscp.support.lottie.LottieComposition;
-import aoscp.support.lottie.LottieDrawable;
-import aoscp.support.lottie.LottieProperty;
-import aoscp.support.lottie.animation.keyframe.BaseKeyframeAnimation;
-import aoscp.support.lottie.animation.keyframe.ValueCallbackKeyframeAnimation;
-import aoscp.support.lottie.model.KeyPath;
-import aoscp.support.lottie.model.animatable.AnimatableFloatValue;
-import aoscp.support.lottie.value.LottieValueCallback;
+import liquid.support.lottie.L;
+import liquid.support.lottie.LottieComposition;
+import liquid.support.lottie.LottieDrawable;
+import liquid.support.lottie.LottieProperty;
+import liquid.support.lottie.animation.keyframe.BaseKeyframeAnimation;
+import liquid.support.lottie.animation.keyframe.ValueCallbackKeyframeAnimation;
+import liquid.support.lottie.model.KeyPath;
+import liquid.support.lottie.model.animatable.AnimatableFloatValue;
+import liquid.support.lottie.value.LottieValueCallback;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/support/java/aoscp/support/lottie/model/layer/ImageLayer.java b/support/java/liquid/support/lottie/model/layer/ImageLayer.java
similarity index 86%
rename from support/java/aoscp/support/lottie/model/layer/ImageLayer.java
rename to support/java/liquid/support/lottie/model/layer/ImageLayer.java
index 22dadc3..7a62ccb 100644
--- a/support/java/aoscp/support/lottie/model/layer/ImageLayer.java
+++ b/support/java/liquid/support/lottie/model/layer/ImageLayer.java
@@ -1,4 +1,4 @@
-package aoscp.support.lottie.model.layer;
+package liquid.support.lottie.model.layer;
 
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
@@ -10,12 +10,12 @@
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 
-import aoscp.support.lottie.LottieDrawable;
-import aoscp.support.lottie.LottieProperty;
-import aoscp.support.lottie.animation.keyframe.BaseKeyframeAnimation;
-import aoscp.support.lottie.animation.keyframe.ValueCallbackKeyframeAnimation;
-import aoscp.support.lottie.utils.Utils;
-import aoscp.support.lottie.value.LottieValueCallback;
+import liquid.support.lottie.LottieDrawable;
+import liquid.support.lottie.LottieProperty;
+import liquid.support.lottie.animation.keyframe.BaseKeyframeAnimation;
+import liquid.support.lottie.animation.keyframe.ValueCallbackKeyframeAnimation;
+import liquid.support.lottie.utils.Utils;
+import liquid.support.lottie.value.LottieValueCallback;
 
 public class ImageLayer extends BaseLayer {
 
diff --git a/support/java/aoscp/support/lottie/model/layer/Layer.java b/support/java/liquid/support/lottie/model/layer/Layer.java
similarity index 90%
rename from support/java/aoscp/support/lottie/model/layer/Layer.java
rename to support/java/liquid/support/lottie/model/layer/Layer.java
index e525900..735ca6d 100644
--- a/support/java/aoscp/support/lottie/model/layer/Layer.java
+++ b/support/java/liquid/support/lottie/model/layer/Layer.java
@@ -1,15 +1,15 @@
-package aoscp.support.lottie.model.layer;
+package liquid.support.lottie.model.layer;
 
 import android.support.annotation.Nullable;
 
-import aoscp.support.lottie.LottieComposition;
-import aoscp.support.lottie.value.Keyframe;
-import aoscp.support.lottie.model.animatable.AnimatableFloatValue;
-import aoscp.support.lottie.model.animatable.AnimatableTextFrame;
-import aoscp.support.lottie.model.animatable.AnimatableTextProperties;
-import aoscp.support.lottie.model.animatable.AnimatableTransform;
-import aoscp.support.lottie.model.content.ContentModel;
-import aoscp.support.lottie.model.content.Mask;
+import liquid.support.lottie.LottieComposition;
+import liquid.support.lottie.value.Keyframe;
+import liquid.support.lottie.model.animatable.AnimatableFloatValue;
+import liquid.support.lottie.model.animatable.AnimatableTextFrame;
+import liquid.support.lottie.model.animatable.AnimatableTextProperties;
+import liquid.support.lottie.model.animatable.AnimatableTransform;
+import liquid.support.lottie.model.content.ContentModel;
+import liquid.support.lottie.model.content.Mask;
 
 import java.util.List;
 import java.util.Locale;
diff --git a/support/java/aoscp/support/lottie/model/layer/NullLayer.java b/support/java/liquid/support/lottie/model/layer/NullLayer.java
similarity index 85%
rename from support/java/aoscp/support/lottie/model/layer/NullLayer.java
rename to support/java/liquid/support/lottie/model/layer/NullLayer.java
index f159d98..84524c3 100644
--- a/support/java/aoscp/support/lottie/model/layer/NullLayer.java
+++ b/support/java/liquid/support/lottie/model/layer/NullLayer.java
@@ -1,10 +1,10 @@
-package aoscp.support.lottie.model.layer;
+package liquid.support.lottie.model.layer;
 
 import android.graphics.Canvas;
 import android.graphics.Matrix;
 import android.graphics.RectF;
 
-import aoscp.support.lottie.LottieDrawable;
+import liquid.support.lottie.LottieDrawable;
 
 public class NullLayer extends BaseLayer {
   NullLayer(LottieDrawable lottieDrawable, Layer layerModel) {
diff --git a/support/java/aoscp/support/lottie/model/layer/ShapeLayer.java b/support/java/liquid/support/lottie/model/layer/ShapeLayer.java
similarity index 80%
rename from support/java/aoscp/support/lottie/model/layer/ShapeLayer.java
rename to support/java/liquid/support/lottie/model/layer/ShapeLayer.java
index 39aa3e1..bad8244 100644
--- a/support/java/aoscp/support/lottie/model/layer/ShapeLayer.java
+++ b/support/java/liquid/support/lottie/model/layer/ShapeLayer.java
@@ -1,15 +1,15 @@
-package aoscp.support.lottie.model.layer;
+package liquid.support.lottie.model.layer;
 
 import android.graphics.Canvas;
 import android.graphics.Matrix;
 import android.graphics.RectF;
 import android.support.annotation.NonNull;
 
-import aoscp.support.lottie.LottieDrawable;
-import aoscp.support.lottie.animation.content.Content;
-import aoscp.support.lottie.animation.content.ContentGroup;
-import aoscp.support.lottie.model.KeyPath;
-import aoscp.support.lottie.model.content.ShapeGroup;
+import liquid.support.lottie.LottieDrawable;
+import liquid.support.lottie.animation.content.Content;
+import liquid.support.lottie.animation.content.ContentGroup;
+import liquid.support.lottie.model.KeyPath;
+import liquid.support.lottie.model.content.ShapeGroup;
 
 import java.util.Collections;
 import java.util.List;
diff --git a/support/java/aoscp/support/lottie/model/layer/SolidLayer.java b/support/java/liquid/support/lottie/model/layer/SolidLayer.java
similarity index 88%
rename from support/java/aoscp/support/lottie/model/layer/SolidLayer.java
rename to support/java/liquid/support/lottie/model/layer/SolidLayer.java
index 3b921cb..e167ec7 100644
--- a/support/java/aoscp/support/lottie/model/layer/SolidLayer.java
+++ b/support/java/liquid/support/lottie/model/layer/SolidLayer.java
@@ -1,4 +1,4 @@
-package aoscp.support.lottie.model.layer;
+package liquid.support.lottie.model.layer;
 
 import android.graphics.Canvas;
 import android.graphics.Color;
@@ -9,11 +9,11 @@
 import android.graphics.RectF;
 import android.support.annotation.Nullable;
 
-import aoscp.support.lottie.LottieDrawable;
-import aoscp.support.lottie.LottieProperty;
-import aoscp.support.lottie.animation.keyframe.BaseKeyframeAnimation;
-import aoscp.support.lottie.animation.keyframe.ValueCallbackKeyframeAnimation;
-import aoscp.support.lottie.value.LottieValueCallback;
+import liquid.support.lottie.LottieDrawable;
+import liquid.support.lottie.LottieProperty;
+import liquid.support.lottie.animation.keyframe.BaseKeyframeAnimation;
+import liquid.support.lottie.animation.keyframe.ValueCallbackKeyframeAnimation;
+import liquid.support.lottie.value.LottieValueCallback;
 
 public class SolidLayer extends BaseLayer {
 
diff --git a/support/java/aoscp/support/lottie/model/layer/TextLayer.java b/support/java/liquid/support/lottie/model/layer/TextLayer.java
similarity index 92%
rename from support/java/aoscp/support/lottie/model/layer/TextLayer.java
rename to support/java/liquid/support/lottie/model/layer/TextLayer.java
index 059b68e..1d3835f 100644
--- a/support/java/aoscp/support/lottie/model/layer/TextLayer.java
+++ b/support/java/liquid/support/lottie/model/layer/TextLayer.java
@@ -1,4 +1,4 @@
-package aoscp.support.lottie.model.layer;
+package liquid.support.lottie.model.layer;
 
 import android.graphics.Canvas;
 import android.graphics.Color;
@@ -9,20 +9,20 @@
 import android.graphics.Typeface;
 import android.support.annotation.Nullable;
 
-import aoscp.support.lottie.LottieComposition;
-import aoscp.support.lottie.LottieDrawable;
-import aoscp.support.lottie.LottieProperty;
-import aoscp.support.lottie.TextDelegate;
-import aoscp.support.lottie.animation.content.ContentGroup;
-import aoscp.support.lottie.animation.keyframe.BaseKeyframeAnimation;
-import aoscp.support.lottie.animation.keyframe.TextKeyframeAnimation;
-import aoscp.support.lottie.model.DocumentData;
-import aoscp.support.lottie.model.Font;
-import aoscp.support.lottie.model.FontCharacter;
-import aoscp.support.lottie.model.animatable.AnimatableTextProperties;
-import aoscp.support.lottie.model.content.ShapeGroup;
-import aoscp.support.lottie.utils.Utils;
-import aoscp.support.lottie.value.LottieValueCallback;
+import liquid.support.lottie.LottieComposition;
+import liquid.support.lottie.LottieDrawable;
+import liquid.support.lottie.LottieProperty;
+import liquid.support.lottie.TextDelegate;
+import liquid.support.lottie.animation.content.ContentGroup;
+import liquid.support.lottie.animation.keyframe.BaseKeyframeAnimation;
+import liquid.support.lottie.animation.keyframe.TextKeyframeAnimation;
+import liquid.support.lottie.model.DocumentData;
+import liquid.support.lottie.model.Font;
+import liquid.support.lottie.model.FontCharacter;
+import liquid.support.lottie.model.animatable.AnimatableTextProperties;
+import liquid.support.lottie.model.content.ShapeGroup;
+import liquid.support.lottie.utils.Utils;
+import liquid.support.lottie.value.LottieValueCallback;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/support/java/aoscp/support/lottie/manager/package-info.java b/support/java/liquid/support/lottie/model/layer/package-info.java
similarity index 75%
copy from support/java/aoscp/support/lottie/manager/package-info.java
copy to support/java/liquid/support/lottie/model/layer/package-info.java
index a735163..601f7f7 100644
--- a/support/java/aoscp/support/lottie/manager/package-info.java
+++ b/support/java/liquid/support/lottie/model/layer/package-info.java
@@ -1,5 +1,5 @@
 @RestrictTo(LIBRARY)
-package aoscp.support.lottie.manager;
+package liquid.support.lottie.model.layer;
 
 import android.support.annotation.RestrictTo;
 
diff --git a/support/java/aoscp/support/lottie/utils/package-info.java b/support/java/liquid/support/lottie/model/package-info.java
similarity index 78%
copy from support/java/aoscp/support/lottie/utils/package-info.java
copy to support/java/liquid/support/lottie/model/package-info.java
index ba38ad7..ba68d3e 100644
--- a/support/java/aoscp/support/lottie/utils/package-info.java
+++ b/support/java/liquid/support/lottie/model/package-info.java
@@ -1,5 +1,5 @@
 @RestrictTo(LIBRARY)
-package aoscp.support.lottie.utils;
+package liquid.support.lottie.model;
 
 import android.support.annotation.RestrictTo;
 
diff --git a/support/java/aoscp/support/lottie/parser/AnimatablePathValueParser.java b/support/java/liquid/support/lottie/parser/AnimatablePathValueParser.java
similarity index 83%
rename from support/java/aoscp/support/lottie/parser/AnimatablePathValueParser.java
rename to support/java/liquid/support/lottie/parser/AnimatablePathValueParser.java
index 6622cbe..3f4515a 100644
--- a/support/java/aoscp/support/lottie/parser/AnimatablePathValueParser.java
+++ b/support/java/liquid/support/lottie/parser/AnimatablePathValueParser.java
@@ -1,16 +1,16 @@
-package aoscp.support.lottie.parser;
+package liquid.support.lottie.parser;
 
 import android.graphics.PointF;
 import android.util.JsonReader;
 import android.util.JsonToken;
 
-import aoscp.support.lottie.LottieComposition;
-import aoscp.support.lottie.value.Keyframe;
-import aoscp.support.lottie.model.animatable.AnimatableFloatValue;
-import aoscp.support.lottie.model.animatable.AnimatablePathValue;
-import aoscp.support.lottie.model.animatable.AnimatableSplitDimensionPathValue;
-import aoscp.support.lottie.model.animatable.AnimatableValue;
-import aoscp.support.lottie.utils.Utils;
+import liquid.support.lottie.LottieComposition;
+import liquid.support.lottie.value.Keyframe;
+import liquid.support.lottie.model.animatable.AnimatableFloatValue;
+import liquid.support.lottie.model.animatable.AnimatablePathValue;
+import liquid.support.lottie.model.animatable.AnimatableSplitDimensionPathValue;
+import liquid.support.lottie.model.animatable.AnimatableValue;
+import liquid.support.lottie.utils.Utils;
 
 import java.io.IOException;
 import java.util.ArrayList;
diff --git a/support/java/aoscp/support/lottie/parser/AnimatableTextPropertiesParser.java b/support/java/liquid/support/lottie/parser/AnimatableTextPropertiesParser.java
similarity index 85%
rename from support/java/aoscp/support/lottie/parser/AnimatableTextPropertiesParser.java
rename to support/java/liquid/support/lottie/parser/AnimatableTextPropertiesParser.java
index 9a1b8fc..d0c5ec7 100644
--- a/support/java/aoscp/support/lottie/parser/AnimatableTextPropertiesParser.java
+++ b/support/java/liquid/support/lottie/parser/AnimatableTextPropertiesParser.java
@@ -1,11 +1,11 @@
-package aoscp.support.lottie.parser;
+package liquid.support.lottie.parser;
 
 import android.util.JsonReader;
 
-import aoscp.support.lottie.LottieComposition;
-import aoscp.support.lottie.model.animatable.AnimatableColorValue;
-import aoscp.support.lottie.model.animatable.AnimatableFloatValue;
-import aoscp.support.lottie.model.animatable.AnimatableTextProperties;
+import liquid.support.lottie.LottieComposition;
+import liquid.support.lottie.model.animatable.AnimatableColorValue;
+import liquid.support.lottie.model.animatable.AnimatableFloatValue;
+import liquid.support.lottie.model.animatable.AnimatableTextProperties;
 
 import java.io.IOException;
 
diff --git a/support/java/aoscp/support/lottie/parser/AnimatableTransformParser.java b/support/java/liquid/support/lottie/parser/AnimatableTransformParser.java
similarity index 83%
rename from support/java/aoscp/support/lottie/parser/AnimatableTransformParser.java
rename to support/java/liquid/support/lottie/parser/AnimatableTransformParser.java
index b9a9cd8..61d070b 100644
--- a/support/java/aoscp/support/lottie/parser/AnimatableTransformParser.java
+++ b/support/java/liquid/support/lottie/parser/AnimatableTransformParser.java
@@ -1,19 +1,19 @@
-package aoscp.support.lottie.parser;
+package liquid.support.lottie.parser;
 
 import android.graphics.PointF;
 import android.util.JsonReader;
 import android.util.JsonToken;
 import android.util.Log;
 
-import aoscp.support.lottie.L;
-import aoscp.support.lottie.LottieComposition;
-import aoscp.support.lottie.model.animatable.AnimatableFloatValue;
-import aoscp.support.lottie.model.animatable.AnimatableIntegerValue;
-import aoscp.support.lottie.model.animatable.AnimatablePathValue;
-import aoscp.support.lottie.model.animatable.AnimatableScaleValue;
-import aoscp.support.lottie.model.animatable.AnimatableTransform;
-import aoscp.support.lottie.model.animatable.AnimatableValue;
-import aoscp.support.lottie.value.ScaleXY;
+import liquid.support.lottie.L;
+import liquid.support.lottie.LottieComposition;
+import liquid.support.lottie.model.animatable.AnimatableFloatValue;
+import liquid.support.lottie.model.animatable.AnimatableIntegerValue;
+import liquid.support.lottie.model.animatable.AnimatablePathValue;
+import liquid.support.lottie.model.animatable.AnimatableScaleValue;
+import liquid.support.lottie.model.animatable.AnimatableTransform;
+import liquid.support.lottie.model.animatable.AnimatableValue;
+import liquid.support.lottie.value.ScaleXY;
 
 import java.io.IOException;
 
diff --git a/support/java/aoscp/support/lottie/parser/AnimatableValueParser.java b/support/java/liquid/support/lottie/parser/AnimatableValueParser.java
similarity index 80%
rename from support/java/aoscp/support/lottie/parser/AnimatableValueParser.java
rename to support/java/liquid/support/lottie/parser/AnimatableValueParser.java
index 54083c9..44c1e66 100644
--- a/support/java/aoscp/support/lottie/parser/AnimatableValueParser.java
+++ b/support/java/liquid/support/lottie/parser/AnimatableValueParser.java
@@ -1,19 +1,19 @@
-package aoscp.support.lottie.parser;
+package liquid.support.lottie.parser;
 
 import android.support.annotation.Nullable;
 import android.util.JsonReader;
 
-import aoscp.support.lottie.LottieComposition;
-import aoscp.support.lottie.value.Keyframe;
-import aoscp.support.lottie.model.animatable.AnimatableColorValue;
-import aoscp.support.lottie.model.animatable.AnimatableFloatValue;
-import aoscp.support.lottie.model.animatable.AnimatableGradientColorValue;
-import aoscp.support.lottie.model.animatable.AnimatableIntegerValue;
-import aoscp.support.lottie.model.animatable.AnimatablePointValue;
-import aoscp.support.lottie.model.animatable.AnimatableScaleValue;
-import aoscp.support.lottie.model.animatable.AnimatableShapeValue;
-import aoscp.support.lottie.model.animatable.AnimatableTextFrame;
-import aoscp.support.lottie.utils.Utils;
+import liquid.support.lottie.LottieComposition;
+import liquid.support.lottie.value.Keyframe;
+import liquid.support.lottie.model.animatable.AnimatableColorValue;
+import liquid.support.lottie.model.animatable.AnimatableFloatValue;
+import liquid.support.lottie.model.animatable.AnimatableGradientColorValue;
+import liquid.support.lottie.model.animatable.AnimatableIntegerValue;
+import liquid.support.lottie.model.animatable.AnimatablePointValue;
+import liquid.support.lottie.model.animatable.AnimatableScaleValue;
+import liquid.support.lottie.model.animatable.AnimatableShapeValue;
+import liquid.support.lottie.model.animatable.AnimatableTextFrame;
+import liquid.support.lottie.utils.Utils;
 
 import java.io.IOException;
 import java.util.List;
diff --git a/support/java/aoscp/support/lottie/parser/AsyncCompositionLoader.java b/support/java/liquid/support/lottie/parser/AsyncCompositionLoader.java
similarity index 82%
rename from support/java/aoscp/support/lottie/parser/AsyncCompositionLoader.java
rename to support/java/liquid/support/lottie/parser/AsyncCompositionLoader.java
index 9b30aaa..e5669f2 100644
--- a/support/java/aoscp/support/lottie/parser/AsyncCompositionLoader.java
+++ b/support/java/liquid/support/lottie/parser/AsyncCompositionLoader.java
@@ -1,11 +1,11 @@
-package aoscp.support.lottie.parser;
+package liquid.support.lottie.parser;
 
 import android.os.AsyncTask;
 import android.util.JsonReader;
 
-import aoscp.support.lottie.Cancellable;
-import aoscp.support.lottie.LottieComposition;
-import aoscp.support.lottie.OnCompositionLoadedListener;
+import liquid.support.lottie.Cancellable;
+import liquid.support.lottie.LottieComposition;
+import liquid.support.lottie.OnCompositionLoadedListener;
 
 import java.io.IOException;
 
diff --git a/support/java/aoscp/support/lottie/parser/CircleShapeParser.java b/support/java/liquid/support/lottie/parser/CircleShapeParser.java
similarity index 79%
rename from support/java/aoscp/support/lottie/parser/CircleShapeParser.java
rename to support/java/liquid/support/lottie/parser/CircleShapeParser.java
index d7f59c7..0a82427 100644
--- a/support/java/aoscp/support/lottie/parser/CircleShapeParser.java
+++ b/support/java/liquid/support/lottie/parser/CircleShapeParser.java
@@ -1,12 +1,12 @@
-package aoscp.support.lottie.parser;
+package liquid.support.lottie.parser;
 
 import android.graphics.PointF;
 import android.util.JsonReader;
 
-import aoscp.support.lottie.LottieComposition;
-import aoscp.support.lottie.model.animatable.AnimatablePointValue;
-import aoscp.support.lottie.model.animatable.AnimatableValue;
-import aoscp.support.lottie.model.content.CircleShape;
+import liquid.support.lottie.LottieComposition;
+import liquid.support.lottie.model.animatable.AnimatablePointValue;
+import liquid.support.lottie.model.animatable.AnimatableValue;
+import liquid.support.lottie.model.content.CircleShape;
 
 import java.io.IOException;
 
diff --git a/support/java/aoscp/support/lottie/parser/ColorParser.java b/support/java/liquid/support/lottie/parser/ColorParser.java
similarity index 95%
rename from support/java/aoscp/support/lottie/parser/ColorParser.java
rename to support/java/liquid/support/lottie/parser/ColorParser.java
index f0755cf..1e8ddae 100644
--- a/support/java/aoscp/support/lottie/parser/ColorParser.java
+++ b/support/java/liquid/support/lottie/parser/ColorParser.java
@@ -1,4 +1,4 @@
-package aoscp.support.lottie.parser;
+package liquid.support.lottie.parser;
 
 import android.graphics.Color;
 import android.util.JsonReader;
diff --git a/support/java/aoscp/support/lottie/parser/ContentModelParser.java b/support/java/liquid/support/lottie/parser/ContentModelParser.java
similarity index 93%
rename from support/java/aoscp/support/lottie/parser/ContentModelParser.java
rename to support/java/liquid/support/lottie/parser/ContentModelParser.java
index 47e9a33..3a8cd2d 100644
--- a/support/java/aoscp/support/lottie/parser/ContentModelParser.java
+++ b/support/java/liquid/support/lottie/parser/ContentModelParser.java
@@ -1,12 +1,12 @@
-package aoscp.support.lottie.parser;
+package liquid.support.lottie.parser;
 
 import android.support.annotation.Nullable;
 import android.util.JsonReader;
 import android.util.Log;
 
-import aoscp.support.lottie.L;
-import aoscp.support.lottie.LottieComposition;
-import aoscp.support.lottie.model.content.ContentModel;
+import liquid.support.lottie.L;
+import liquid.support.lottie.LottieComposition;
+import liquid.support.lottie.model.content.ContentModel;
 
 import java.io.IOException;
 
diff --git a/support/java/aoscp/support/lottie/parser/DocumentDataParser.java b/support/java/liquid/support/lottie/parser/DocumentDataParser.java
similarity index 95%
rename from support/java/aoscp/support/lottie/parser/DocumentDataParser.java
rename to support/java/liquid/support/lottie/parser/DocumentDataParser.java
index f1420f7..765af90 100644
--- a/support/java/aoscp/support/lottie/parser/DocumentDataParser.java
+++ b/support/java/liquid/support/lottie/parser/DocumentDataParser.java
@@ -1,8 +1,8 @@
-package aoscp.support.lottie.parser;
+package liquid.support.lottie.parser;
 
 import android.util.JsonReader;
 
-import aoscp.support.lottie.model.DocumentData;
+import liquid.support.lottie.model.DocumentData;
 
 import java.io.IOException;
 
diff --git a/support/java/aoscp/support/lottie/parser/FloatParser.java b/support/java/liquid/support/lottie/parser/FloatParser.java
similarity index 90%
rename from support/java/aoscp/support/lottie/parser/FloatParser.java
rename to support/java/liquid/support/lottie/parser/FloatParser.java
index 9f77cd5..fbd9fcd 100644
--- a/support/java/aoscp/support/lottie/parser/FloatParser.java
+++ b/support/java/liquid/support/lottie/parser/FloatParser.java
@@ -1,4 +1,4 @@
-package aoscp.support.lottie.parser;
+package liquid.support.lottie.parser;
 
 import android.util.JsonReader;
 
diff --git a/support/java/aoscp/support/lottie/parser/FontCharacterParser.java b/support/java/liquid/support/lottie/parser/FontCharacterParser.java
similarity index 89%
rename from support/java/aoscp/support/lottie/parser/FontCharacterParser.java
rename to support/java/liquid/support/lottie/parser/FontCharacterParser.java
index d7746b5..542ca3b 100644
--- a/support/java/aoscp/support/lottie/parser/FontCharacterParser.java
+++ b/support/java/liquid/support/lottie/parser/FontCharacterParser.java
@@ -1,10 +1,10 @@
-package aoscp.support.lottie.parser;
+package liquid.support.lottie.parser;
 
 import android.util.JsonReader;
 
-import aoscp.support.lottie.LottieComposition;
-import aoscp.support.lottie.model.FontCharacter;
-import aoscp.support.lottie.model.content.ShapeGroup;
+import liquid.support.lottie.LottieComposition;
+import liquid.support.lottie.model.FontCharacter;
+import liquid.support.lottie.model.content.ShapeGroup;
 
 import java.io.IOException;
 import java.util.ArrayList;
diff --git a/support/java/aoscp/support/lottie/parser/FontParser.java b/support/java/liquid/support/lottie/parser/FontParser.java
similarity index 91%
rename from support/java/aoscp/support/lottie/parser/FontParser.java
rename to support/java/liquid/support/lottie/parser/FontParser.java
index 616e1c3..75b1f7e 100644
--- a/support/java/aoscp/support/lottie/parser/FontParser.java
+++ b/support/java/liquid/support/lottie/parser/FontParser.java
@@ -1,8 +1,8 @@
-package aoscp.support.lottie.parser;
+package liquid.support.lottie.parser;
 
 import android.util.JsonReader;
 
-import aoscp.support.lottie.model.Font;
+import liquid.support.lottie.model.Font;
 
 import java.io.IOException;
 
diff --git a/support/java/aoscp/support/lottie/parser/GradientColorParser.java b/support/java/liquid/support/lottie/parser/GradientColorParser.java
similarity index 94%
rename from support/java/aoscp/support/lottie/parser/GradientColorParser.java
rename to support/java/liquid/support/lottie/parser/GradientColorParser.java
index adf54c5..3a45be3 100644
--- a/support/java/aoscp/support/lottie/parser/GradientColorParser.java
+++ b/support/java/liquid/support/lottie/parser/GradientColorParser.java
@@ -1,18 +1,18 @@
-package aoscp.support.lottie.parser;
+package liquid.support.lottie.parser;
 
 import android.graphics.Color;
 import android.support.annotation.IntRange;
 import android.util.JsonReader;
 import android.util.JsonToken;
 
-import aoscp.support.lottie.model.content.GradientColor;
-import aoscp.support.lottie.utils.MiscUtils;
+import liquid.support.lottie.model.content.GradientColor;
+import liquid.support.lottie.utils.MiscUtils;
 
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
-public class GradientColorParser implements aoscp.support.lottie.parser.ValueParser<GradientColor> {
+public class GradientColorParser implements liquid.support.lottie.parser.ValueParser<GradientColor> {
   /** The number of colors if it exists in the json or -1 if it doesn't (legacy bodymovin) */
   private int colorPoints;
 
diff --git a/support/java/aoscp/support/lottie/parser/GradientFillParser.java b/support/java/liquid/support/lottie/parser/GradientFillParser.java
similarity index 82%
rename from support/java/aoscp/support/lottie/parser/GradientFillParser.java
rename to support/java/liquid/support/lottie/parser/GradientFillParser.java
index ae33147..2d70028 100644
--- a/support/java/aoscp/support/lottie/parser/GradientFillParser.java
+++ b/support/java/liquid/support/lottie/parser/GradientFillParser.java
@@ -1,14 +1,14 @@
-package aoscp.support.lottie.parser;
+package liquid.support.lottie.parser;
 
 import android.graphics.Path;
 import android.util.JsonReader;
 
-import aoscp.support.lottie.LottieComposition;
-import aoscp.support.lottie.model.animatable.AnimatableGradientColorValue;
-import aoscp.support.lottie.model.animatable.AnimatableIntegerValue;
-import aoscp.support.lottie.model.animatable.AnimatablePointValue;
-import aoscp.support.lottie.model.content.GradientFill;
-import aoscp.support.lottie.model.content.GradientType;
+import liquid.support.lottie.LottieComposition;
+import liquid.support.lottie.model.animatable.AnimatableGradientColorValue;
+import liquid.support.lottie.model.animatable.AnimatableIntegerValue;
+import liquid.support.lottie.model.animatable.AnimatablePointValue;
+import liquid.support.lottie.model.content.GradientFill;
+import liquid.support.lottie.model.content.GradientType;
 
 import java.io.IOException;
 
diff --git a/support/java/aoscp/support/lottie/parser/GradientStrokeParser.java b/support/java/liquid/support/lottie/parser/GradientStrokeParser.java
similarity index 86%
rename from support/java/aoscp/support/lottie/parser/GradientStrokeParser.java
rename to support/java/liquid/support/lottie/parser/GradientStrokeParser.java
index feaf726..fc45e41 100644
--- a/support/java/aoscp/support/lottie/parser/GradientStrokeParser.java
+++ b/support/java/liquid/support/lottie/parser/GradientStrokeParser.java
@@ -1,15 +1,15 @@
-package aoscp.support.lottie.parser;
+package liquid.support.lottie.parser;
 
 import android.util.JsonReader;
 
-import aoscp.support.lottie.LottieComposition;
-import aoscp.support.lottie.model.animatable.AnimatableFloatValue;
-import aoscp.support.lottie.model.animatable.AnimatableGradientColorValue;
-import aoscp.support.lottie.model.animatable.AnimatableIntegerValue;
-import aoscp.support.lottie.model.animatable.AnimatablePointValue;
-import aoscp.support.lottie.model.content.GradientStroke;
-import aoscp.support.lottie.model.content.GradientType;
-import aoscp.support.lottie.model.content.ShapeStroke;
+import liquid.support.lottie.LottieComposition;
+import liquid.support.lottie.model.animatable.AnimatableFloatValue;
+import liquid.support.lottie.model.animatable.AnimatableGradientColorValue;
+import liquid.support.lottie.model.animatable.AnimatableIntegerValue;
+import liquid.support.lottie.model.animatable.AnimatablePointValue;
+import liquid.support.lottie.model.content.GradientStroke;
+import liquid.support.lottie.model.content.GradientType;
+import liquid.support.lottie.model.content.ShapeStroke;
 
 import java.io.IOException;
 import java.util.ArrayList;
diff --git a/support/java/aoscp/support/lottie/parser/IntegerParser.java b/support/java/liquid/support/lottie/parser/IntegerParser.java
similarity index 90%
rename from support/java/aoscp/support/lottie/parser/IntegerParser.java
rename to support/java/liquid/support/lottie/parser/IntegerParser.java
index 957f1a1..738b7bd 100644
--- a/support/java/aoscp/support/lottie/parser/IntegerParser.java
+++ b/support/java/liquid/support/lottie/parser/IntegerParser.java
@@ -1,4 +1,4 @@
-package aoscp.support.lottie.parser;
+package liquid.support.lottie.parser;
 
 import android.util.JsonReader;
 
diff --git a/support/java/aoscp/support/lottie/parser/JsonUtils.java b/support/java/liquid/support/lottie/parser/JsonUtils.java
similarity index 98%
rename from support/java/aoscp/support/lottie/parser/JsonUtils.java
rename to support/java/liquid/support/lottie/parser/JsonUtils.java
index 4ce9368..986eb15 100644
--- a/support/java/aoscp/support/lottie/parser/JsonUtils.java
+++ b/support/java/liquid/support/lottie/parser/JsonUtils.java
@@ -1,4 +1,4 @@
-package aoscp.support.lottie.parser;
+package liquid.support.lottie.parser;
 
 import android.graphics.Color;
 import android.graphics.PointF;
diff --git a/support/java/aoscp/support/lottie/parser/KeyframeParser.java b/support/java/liquid/support/lottie/parser/KeyframeParser.java
similarity index 95%
rename from support/java/aoscp/support/lottie/parser/KeyframeParser.java
rename to support/java/liquid/support/lottie/parser/KeyframeParser.java
index a091085..c05384a 100644
--- a/support/java/aoscp/support/lottie/parser/KeyframeParser.java
+++ b/support/java/liquid/support/lottie/parser/KeyframeParser.java
@@ -1,4 +1,4 @@
-package aoscp.support.lottie.parser;
+package liquid.support.lottie.parser;
 
 import android.graphics.PointF;
 import android.support.annotation.Nullable;
@@ -8,10 +8,10 @@
 import android.view.animation.Interpolator;
 import android.view.animation.LinearInterpolator;
 
-import aoscp.support.lottie.LottieComposition;
-import aoscp.support.lottie.value.Keyframe;
-import aoscp.support.lottie.utils.MiscUtils;
-import aoscp.support.lottie.utils.Utils;
+import liquid.support.lottie.LottieComposition;
+import liquid.support.lottie.value.Keyframe;
+import liquid.support.lottie.utils.MiscUtils;
+import liquid.support.lottie.utils.Utils;
 
 import java.io.IOException;
 import java.lang.ref.WeakReference;
diff --git a/support/java/aoscp/support/lottie/parser/KeyframesParser.java b/support/java/liquid/support/lottie/parser/KeyframesParser.java
similarity index 94%
rename from support/java/aoscp/support/lottie/parser/KeyframesParser.java
rename to support/java/liquid/support/lottie/parser/KeyframesParser.java
index 912dbf7..129d687 100644
--- a/support/java/aoscp/support/lottie/parser/KeyframesParser.java
+++ b/support/java/liquid/support/lottie/parser/KeyframesParser.java
@@ -1,10 +1,10 @@
-package aoscp.support.lottie.parser;
+package liquid.support.lottie.parser;
 
 import android.util.JsonReader;
 import android.util.JsonToken;
 
-import aoscp.support.lottie.LottieComposition;
-import aoscp.support.lottie.value.Keyframe;
+import liquid.support.lottie.LottieComposition;
+import liquid.support.lottie.value.Keyframe;
 
 import java.io.IOException;
 import java.util.ArrayList;
diff --git a/support/java/aoscp/support/lottie/parser/LayerParser.java b/support/java/liquid/support/lottie/parser/LayerParser.java
similarity index 92%
rename from support/java/aoscp/support/lottie/parser/LayerParser.java
rename to support/java/liquid/support/lottie/parser/LayerParser.java
index 548669d..26f536c 100644
--- a/support/java/aoscp/support/lottie/parser/LayerParser.java
+++ b/support/java/liquid/support/lottie/parser/LayerParser.java
@@ -1,19 +1,19 @@
-package aoscp.support.lottie.parser;
+package liquid.support.lottie.parser;
 
 import android.graphics.Color;
 import android.graphics.Rect;
 import android.util.JsonReader;
 
-import aoscp.support.lottie.LottieComposition;
-import aoscp.support.lottie.value.Keyframe;
-import aoscp.support.lottie.model.animatable.AnimatableFloatValue;
-import aoscp.support.lottie.model.animatable.AnimatableTextFrame;
-import aoscp.support.lottie.model.animatable.AnimatableTextProperties;
-import aoscp.support.lottie.model.animatable.AnimatableTransform;
-import aoscp.support.lottie.model.content.ContentModel;
-import aoscp.support.lottie.model.content.Mask;
-import aoscp.support.lottie.model.layer.Layer;
-import aoscp.support.lottie.utils.Utils;
+import liquid.support.lottie.LottieComposition;
+import liquid.support.lottie.value.Keyframe;
+import liquid.support.lottie.model.animatable.AnimatableFloatValue;
+import liquid.support.lottie.model.animatable.AnimatableTextFrame;
+import liquid.support.lottie.model.animatable.AnimatableTextProperties;
+import liquid.support.lottie.model.animatable.AnimatableTransform;
+import liquid.support.lottie.model.content.ContentModel;
+import liquid.support.lottie.model.content.Mask;
+import liquid.support.lottie.model.layer.Layer;
+import liquid.support.lottie.utils.Utils;
 
 import java.io.IOException;
 import java.util.ArrayList;
diff --git a/support/java/aoscp/support/lottie/parser/LottieCompositionParser.java b/support/java/liquid/support/lottie/parser/LottieCompositionParser.java
similarity index 94%
rename from support/java/aoscp/support/lottie/parser/LottieCompositionParser.java
rename to support/java/liquid/support/lottie/parser/LottieCompositionParser.java
index f04895f..126f9bf 100644
--- a/support/java/aoscp/support/lottie/parser/LottieCompositionParser.java
+++ b/support/java/liquid/support/lottie/parser/LottieCompositionParser.java
@@ -1,17 +1,17 @@
-package aoscp.support.lottie.parser;
+package liquid.support.lottie.parser;
 
 import android.graphics.Rect;
 import android.support.v4.util.LongSparseArray;
 import android.support.v4.util.SparseArrayCompat;
 import android.util.JsonReader;
 
-import aoscp.support.lottie.L;
-import aoscp.support.lottie.LottieComposition;
-import aoscp.support.lottie.LottieImageAsset;
-import aoscp.support.lottie.model.Font;
-import aoscp.support.lottie.model.FontCharacter;
-import aoscp.support.lottie.model.layer.Layer;
-import aoscp.support.lottie.utils.Utils;
+import liquid.support.lottie.L;
+import liquid.support.lottie.LottieComposition;
+import liquid.support.lottie.LottieImageAsset;
+import liquid.support.lottie.model.Font;
+import liquid.support.lottie.model.FontCharacter;
+import liquid.support.lottie.model.layer.Layer;
+import liquid.support.lottie.utils.Utils;
 
 import java.io.IOException;
 import java.util.ArrayList;
diff --git a/support/java/aoscp/support/lottie/parser/MaskParser.java b/support/java/liquid/support/lottie/parser/MaskParser.java
similarity index 81%
rename from support/java/aoscp/support/lottie/parser/MaskParser.java
rename to support/java/liquid/support/lottie/parser/MaskParser.java
index 6b5c2b0..e41806c 100644
--- a/support/java/aoscp/support/lottie/parser/MaskParser.java
+++ b/support/java/liquid/support/lottie/parser/MaskParser.java
@@ -1,13 +1,13 @@
-package aoscp.support.lottie.parser;
+package liquid.support.lottie.parser;
 
 import android.util.JsonReader;
 import android.util.Log;
 
-import aoscp.support.lottie.L;
-import aoscp.support.lottie.LottieComposition;
-import aoscp.support.lottie.model.animatable.AnimatableIntegerValue;
-import aoscp.support.lottie.model.animatable.AnimatableShapeValue;
-import aoscp.support.lottie.model.content.Mask;
+import liquid.support.lottie.L;
+import liquid.support.lottie.LottieComposition;
+import liquid.support.lottie.model.animatable.AnimatableIntegerValue;
+import liquid.support.lottie.model.animatable.AnimatableShapeValue;
+import liquid.support.lottie.model.content.Mask;
 
 import java.io.IOException;
 
diff --git a/support/java/aoscp/support/lottie/parser/MergePathsParser.java b/support/java/liquid/support/lottie/parser/MergePathsParser.java
similarity index 86%
rename from support/java/aoscp/support/lottie/parser/MergePathsParser.java
rename to support/java/liquid/support/lottie/parser/MergePathsParser.java
index cf74439..c933367 100644
--- a/support/java/aoscp/support/lottie/parser/MergePathsParser.java
+++ b/support/java/liquid/support/lottie/parser/MergePathsParser.java
@@ -1,8 +1,8 @@
-package aoscp.support.lottie.parser;
+package liquid.support.lottie.parser;
 
 import android.util.JsonReader;
 
-import aoscp.support.lottie.model.content.MergePaths;
+import liquid.support.lottie.model.content.MergePaths;
 
 import java.io.IOException;
 
diff --git a/support/java/aoscp/support/lottie/parser/PathKeyframeParser.java b/support/java/liquid/support/lottie/parser/PathKeyframeParser.java
similarity index 70%
rename from support/java/aoscp/support/lottie/parser/PathKeyframeParser.java
rename to support/java/liquid/support/lottie/parser/PathKeyframeParser.java
index 8a6f470..64cbb61 100644
--- a/support/java/aoscp/support/lottie/parser/PathKeyframeParser.java
+++ b/support/java/liquid/support/lottie/parser/PathKeyframeParser.java
@@ -1,13 +1,13 @@
-package aoscp.support.lottie.parser;
+package liquid.support.lottie.parser;
 
 import android.graphics.PointF;
 import android.util.JsonReader;
 import android.util.JsonToken;
 
-import aoscp.support.lottie.LottieComposition;
-import aoscp.support.lottie.value.Keyframe;
-import aoscp.support.lottie.animation.keyframe.PathKeyframe;
-import aoscp.support.lottie.utils.Utils;
+import liquid.support.lottie.LottieComposition;
+import liquid.support.lottie.value.Keyframe;
+import liquid.support.lottie.animation.keyframe.PathKeyframe;
+import liquid.support.lottie.utils.Utils;
 
 import java.io.IOException;
 
diff --git a/support/java/aoscp/support/lottie/parser/PathParser.java b/support/java/liquid/support/lottie/parser/PathParser.java
similarity index 90%
rename from support/java/aoscp/support/lottie/parser/PathParser.java
rename to support/java/liquid/support/lottie/parser/PathParser.java
index 678c476..843a85f 100644
--- a/support/java/aoscp/support/lottie/parser/PathParser.java
+++ b/support/java/liquid/support/lottie/parser/PathParser.java
@@ -1,4 +1,4 @@
-package aoscp.support.lottie.parser;
+package liquid.support.lottie.parser;
 
 import android.graphics.PointF;
 import android.util.JsonReader;
diff --git a/support/java/aoscp/support/lottie/parser/PointFParser.java b/support/java/liquid/support/lottie/parser/PointFParser.java
similarity index 96%
rename from support/java/aoscp/support/lottie/parser/PointFParser.java
rename to support/java/liquid/support/lottie/parser/PointFParser.java
index ce590b2..dee6dc9 100644
--- a/support/java/aoscp/support/lottie/parser/PointFParser.java
+++ b/support/java/liquid/support/lottie/parser/PointFParser.java
@@ -1,4 +1,4 @@
-package aoscp.support.lottie.parser;
+package liquid.support.lottie.parser;
 
 import android.graphics.PointF;
 import android.util.JsonReader;
diff --git a/support/java/aoscp/support/lottie/parser/PolystarShapeParser.java b/support/java/liquid/support/lottie/parser/PolystarShapeParser.java
similarity index 87%
rename from support/java/aoscp/support/lottie/parser/PolystarShapeParser.java
rename to support/java/liquid/support/lottie/parser/PolystarShapeParser.java
index 53e1573..f34b34b 100644
--- a/support/java/aoscp/support/lottie/parser/PolystarShapeParser.java
+++ b/support/java/liquid/support/lottie/parser/PolystarShapeParser.java
@@ -1,12 +1,12 @@
-package aoscp.support.lottie.parser;
+package liquid.support.lottie.parser;
 
 import android.graphics.PointF;
 import android.util.JsonReader;
 
-import aoscp.support.lottie.LottieComposition;
-import aoscp.support.lottie.model.animatable.AnimatableFloatValue;
-import aoscp.support.lottie.model.animatable.AnimatableValue;
-import aoscp.support.lottie.model.content.PolystarShape;
+import liquid.support.lottie.LottieComposition;
+import liquid.support.lottie.model.animatable.AnimatableFloatValue;
+import liquid.support.lottie.model.animatable.AnimatableValue;
+import liquid.support.lottie.model.content.PolystarShape;
 
 import java.io.IOException;
 
diff --git a/support/java/aoscp/support/lottie/parser/RectangleShapeParser.java b/support/java/liquid/support/lottie/parser/RectangleShapeParser.java
similarity index 75%
rename from support/java/aoscp/support/lottie/parser/RectangleShapeParser.java
rename to support/java/liquid/support/lottie/parser/RectangleShapeParser.java
index a06563a..ee8a292 100644
--- a/support/java/aoscp/support/lottie/parser/RectangleShapeParser.java
+++ b/support/java/liquid/support/lottie/parser/RectangleShapeParser.java
@@ -1,13 +1,13 @@
-package aoscp.support.lottie.parser;
+package liquid.support.lottie.parser;
 
 import android.graphics.PointF;
 import android.util.JsonReader;
 
-import aoscp.support.lottie.LottieComposition;
-import aoscp.support.lottie.model.animatable.AnimatableFloatValue;
-import aoscp.support.lottie.model.animatable.AnimatablePointValue;
-import aoscp.support.lottie.model.animatable.AnimatableValue;
-import aoscp.support.lottie.model.content.RectangleShape;
+import liquid.support.lottie.LottieComposition;
+import liquid.support.lottie.model.animatable.AnimatableFloatValue;
+import liquid.support.lottie.model.animatable.AnimatablePointValue;
+import liquid.support.lottie.model.animatable.AnimatableValue;
+import liquid.support.lottie.model.content.RectangleShape;
 
 import java.io.IOException;
 
diff --git a/support/java/aoscp/support/lottie/parser/RepeaterParser.java b/support/java/liquid/support/lottie/parser/RepeaterParser.java
similarity index 78%
rename from support/java/aoscp/support/lottie/parser/RepeaterParser.java
rename to support/java/liquid/support/lottie/parser/RepeaterParser.java
index 4f42cd1..7fd6249 100644
--- a/support/java/aoscp/support/lottie/parser/RepeaterParser.java
+++ b/support/java/liquid/support/lottie/parser/RepeaterParser.java
@@ -1,11 +1,11 @@
-package aoscp.support.lottie.parser;
+package liquid.support.lottie.parser;
 
 import android.util.JsonReader;
 
-import aoscp.support.lottie.LottieComposition;
-import aoscp.support.lottie.model.animatable.AnimatableFloatValue;
-import aoscp.support.lottie.model.animatable.AnimatableTransform;
-import aoscp.support.lottie.model.content.Repeater;
+import liquid.support.lottie.LottieComposition;
+import liquid.support.lottie.model.animatable.AnimatableFloatValue;
+import liquid.support.lottie.model.animatable.AnimatableTransform;
+import liquid.support.lottie.model.content.Repeater;
 
 import java.io.IOException;
 
diff --git a/support/java/aoscp/support/lottie/parser/ScaleXYParser.java b/support/java/liquid/support/lottie/parser/ScaleXYParser.java
similarity index 89%
rename from support/java/aoscp/support/lottie/parser/ScaleXYParser.java
rename to support/java/liquid/support/lottie/parser/ScaleXYParser.java
index 19c067e..40e75b3 100644
--- a/support/java/aoscp/support/lottie/parser/ScaleXYParser.java
+++ b/support/java/liquid/support/lottie/parser/ScaleXYParser.java
@@ -1,9 +1,9 @@
-package aoscp.support.lottie.parser;
+package liquid.support.lottie.parser;
 
 import android.util.JsonReader;
 import android.util.JsonToken;
 
-import aoscp.support.lottie.value.ScaleXY;
+import liquid.support.lottie.value.ScaleXY;
 
 import java.io.IOException;
 
diff --git a/support/java/aoscp/support/lottie/parser/ShapeDataParser.java b/support/java/liquid/support/lottie/parser/ShapeDataParser.java
similarity index 93%
rename from support/java/aoscp/support/lottie/parser/ShapeDataParser.java
rename to support/java/liquid/support/lottie/parser/ShapeDataParser.java
index 8592cf8..96008c2 100644
--- a/support/java/aoscp/support/lottie/parser/ShapeDataParser.java
+++ b/support/java/liquid/support/lottie/parser/ShapeDataParser.java
@@ -1,12 +1,12 @@
-package aoscp.support.lottie.parser;
+package liquid.support.lottie.parser;
 
 import android.graphics.PointF;
 import android.util.JsonReader;
 import android.util.JsonToken;
 
-import aoscp.support.lottie.model.CubicCurveData;
-import aoscp.support.lottie.model.content.ShapeData;
-import aoscp.support.lottie.utils.MiscUtils;
+import liquid.support.lottie.model.CubicCurveData;
+import liquid.support.lottie.model.content.ShapeData;
+import liquid.support.lottie.utils.MiscUtils;
 
 import java.io.IOException;
 import java.util.ArrayList;
diff --git a/support/java/aoscp/support/lottie/parser/ShapeFillParser.java b/support/java/liquid/support/lottie/parser/ShapeFillParser.java
similarity index 80%
rename from support/java/aoscp/support/lottie/parser/ShapeFillParser.java
rename to support/java/liquid/support/lottie/parser/ShapeFillParser.java
index 994ab45..ef4305f 100644
--- a/support/java/aoscp/support/lottie/parser/ShapeFillParser.java
+++ b/support/java/liquid/support/lottie/parser/ShapeFillParser.java
@@ -1,12 +1,12 @@
-package aoscp.support.lottie.parser;
+package liquid.support.lottie.parser;
 
 import android.graphics.Path;
 import android.util.JsonReader;
 
-import aoscp.support.lottie.LottieComposition;
-import aoscp.support.lottie.model.animatable.AnimatableColorValue;
-import aoscp.support.lottie.model.animatable.AnimatableIntegerValue;
-import aoscp.support.lottie.model.content.ShapeFill;
+import liquid.support.lottie.LottieComposition;
+import liquid.support.lottie.model.animatable.AnimatableColorValue;
+import liquid.support.lottie.model.animatable.AnimatableIntegerValue;
+import liquid.support.lottie.model.content.ShapeFill;
 
 import java.io.IOException;
 
diff --git a/support/java/aoscp/support/lottie/parser/ShapeGroupParser.java b/support/java/liquid/support/lottie/parser/ShapeGroupParser.java
similarity index 82%
rename from support/java/aoscp/support/lottie/parser/ShapeGroupParser.java
rename to support/java/liquid/support/lottie/parser/ShapeGroupParser.java
index 1bfed61..9670cfe 100644
--- a/support/java/aoscp/support/lottie/parser/ShapeGroupParser.java
+++ b/support/java/liquid/support/lottie/parser/ShapeGroupParser.java
@@ -1,10 +1,10 @@
-package aoscp.support.lottie.parser;
+package liquid.support.lottie.parser;
 
 import android.util.JsonReader;
 
-import aoscp.support.lottie.LottieComposition;
-import aoscp.support.lottie.model.content.ContentModel;
-import aoscp.support.lottie.model.content.ShapeGroup;
+import liquid.support.lottie.LottieComposition;
+import liquid.support.lottie.model.content.ContentModel;
+import liquid.support.lottie.model.content.ShapeGroup;
 
 import java.io.IOException;
 import java.util.ArrayList;
diff --git a/support/java/aoscp/support/lottie/parser/ShapePathParser.java b/support/java/liquid/support/lottie/parser/ShapePathParser.java
similarity index 78%
rename from support/java/aoscp/support/lottie/parser/ShapePathParser.java
rename to support/java/liquid/support/lottie/parser/ShapePathParser.java
index a686f45..3b84c66 100644
--- a/support/java/aoscp/support/lottie/parser/ShapePathParser.java
+++ b/support/java/liquid/support/lottie/parser/ShapePathParser.java
@@ -1,10 +1,10 @@
-package aoscp.support.lottie.parser;
+package liquid.support.lottie.parser;
 
 import android.util.JsonReader;
 
-import aoscp.support.lottie.LottieComposition;
-import aoscp.support.lottie.model.animatable.AnimatableShapeValue;
-import aoscp.support.lottie.model.content.ShapePath;
+import liquid.support.lottie.LottieComposition;
+import liquid.support.lottie.model.animatable.AnimatableShapeValue;
+import liquid.support.lottie.model.content.ShapePath;
 
 import java.io.IOException;
 
diff --git a/support/java/aoscp/support/lottie/parser/ShapeStrokeParser.java b/support/java/liquid/support/lottie/parser/ShapeStrokeParser.java
similarity index 88%
rename from support/java/aoscp/support/lottie/parser/ShapeStrokeParser.java
rename to support/java/liquid/support/lottie/parser/ShapeStrokeParser.java
index e11061b..3ed83a3 100644
--- a/support/java/aoscp/support/lottie/parser/ShapeStrokeParser.java
+++ b/support/java/liquid/support/lottie/parser/ShapeStrokeParser.java
@@ -1,12 +1,12 @@
-package aoscp.support.lottie.parser;
+package liquid.support.lottie.parser;
 
 import android.util.JsonReader;
 
-import aoscp.support.lottie.LottieComposition;
-import aoscp.support.lottie.model.animatable.AnimatableColorValue;
-import aoscp.support.lottie.model.animatable.AnimatableFloatValue;
-import aoscp.support.lottie.model.animatable.AnimatableIntegerValue;
-import aoscp.support.lottie.model.content.ShapeStroke;
+import liquid.support.lottie.LottieComposition;
+import liquid.support.lottie.model.animatable.AnimatableColorValue;
+import liquid.support.lottie.model.animatable.AnimatableFloatValue;
+import liquid.support.lottie.model.animatable.AnimatableIntegerValue;
+import liquid.support.lottie.model.content.ShapeStroke;
 
 import java.io.IOException;
 import java.util.ArrayList;
diff --git a/support/java/aoscp/support/lottie/parser/ShapeTrimPathParser.java b/support/java/liquid/support/lottie/parser/ShapeTrimPathParser.java
similarity index 83%
rename from support/java/aoscp/support/lottie/parser/ShapeTrimPathParser.java
rename to support/java/liquid/support/lottie/parser/ShapeTrimPathParser.java
index 277b63f..55c942a 100644
--- a/support/java/aoscp/support/lottie/parser/ShapeTrimPathParser.java
+++ b/support/java/liquid/support/lottie/parser/ShapeTrimPathParser.java
@@ -1,10 +1,10 @@
-package aoscp.support.lottie.parser;
+package liquid.support.lottie.parser;
 
 import android.util.JsonReader;
 
-import aoscp.support.lottie.LottieComposition;
-import aoscp.support.lottie.model.animatable.AnimatableFloatValue;
-import aoscp.support.lottie.model.content.ShapeTrimPath;
+import liquid.support.lottie.LottieComposition;
+import liquid.support.lottie.model.animatable.AnimatableFloatValue;
+import liquid.support.lottie.model.content.ShapeTrimPath;
 
 import java.io.IOException;
 
diff --git a/support/java/aoscp/support/lottie/parser/ValueParser.java b/support/java/liquid/support/lottie/parser/ValueParser.java
similarity index 80%
rename from support/java/aoscp/support/lottie/parser/ValueParser.java
rename to support/java/liquid/support/lottie/parser/ValueParser.java
index 137396a..cff4c83 100644
--- a/support/java/aoscp/support/lottie/parser/ValueParser.java
+++ b/support/java/liquid/support/lottie/parser/ValueParser.java
@@ -1,4 +1,4 @@
-package aoscp.support.lottie.parser;
+package liquid.support.lottie.parser;
 
 import android.util.JsonReader;
 
diff --git a/support/java/aoscp/support/lottie/manager/package-info.java b/support/java/liquid/support/lottie/parser/package-info.java
similarity index 77%
rename from support/java/aoscp/support/lottie/manager/package-info.java
rename to support/java/liquid/support/lottie/parser/package-info.java
index a735163..7318102 100644
--- a/support/java/aoscp/support/lottie/manager/package-info.java
+++ b/support/java/liquid/support/lottie/parser/package-info.java
@@ -1,5 +1,5 @@
 @RestrictTo(LIBRARY)
-package aoscp.support.lottie.manager;
+package liquid.support.lottie.parser;
 
 import android.support.annotation.RestrictTo;
 
diff --git a/support/java/aoscp/support/lottie/utils/BaseLottieAnimator.java b/support/java/liquid/support/lottie/utils/BaseLottieAnimator.java
similarity index 98%
rename from support/java/aoscp/support/lottie/utils/BaseLottieAnimator.java
rename to support/java/liquid/support/lottie/utils/BaseLottieAnimator.java
index ae99bf1..baa9533 100644
--- a/support/java/aoscp/support/lottie/utils/BaseLottieAnimator.java
+++ b/support/java/liquid/support/lottie/utils/BaseLottieAnimator.java
@@ -1,4 +1,4 @@
-package aoscp.support.lottie.utils;
+package liquid.support.lottie.utils;
 
 import android.animation.Animator;
 import android.animation.TimeInterpolator;
diff --git a/support/java/aoscp/support/lottie/utils/GammaEvaluator.java b/support/java/liquid/support/lottie/utils/GammaEvaluator.java
similarity index 98%
rename from support/java/aoscp/support/lottie/utils/GammaEvaluator.java
rename to support/java/liquid/support/lottie/utils/GammaEvaluator.java
index ee6053f..5bbace3 100644
--- a/support/java/aoscp/support/lottie/utils/GammaEvaluator.java
+++ b/support/java/liquid/support/lottie/utils/GammaEvaluator.java
@@ -1,4 +1,4 @@
-package aoscp.support.lottie.utils;
+package liquid.support.lottie.utils;
 
 /**
  * Use this instead of {@link android.animation.ArgbEvaluator} because it interpolates through the gamma color
diff --git a/support/java/aoscp/support/lottie/utils/LottieValueAnimator.java b/support/java/liquid/support/lottie/utils/LottieValueAnimator.java
similarity index 98%
rename from support/java/aoscp/support/lottie/utils/LottieValueAnimator.java
rename to support/java/liquid/support/lottie/utils/LottieValueAnimator.java
index 39b9680..1bbddf8 100644
--- a/support/java/aoscp/support/lottie/utils/LottieValueAnimator.java
+++ b/support/java/liquid/support/lottie/utils/LottieValueAnimator.java
@@ -1,4 +1,4 @@
-package aoscp.support.lottie.utils;
+package liquid.support.lottie.utils;
 
 import android.animation.ValueAnimator;
 import android.support.annotation.FloatRange;
@@ -6,7 +6,7 @@
 import android.support.annotation.VisibleForTesting;
 import android.view.Choreographer;
 
-import aoscp.support.lottie.LottieComposition;
+import liquid.support.lottie.LottieComposition;
 
 /**
  * This is a slightly modified {@link ValueAnimator} that allows us to update start and end values
diff --git a/support/java/aoscp/support/lottie/utils/MeanCalculator.java b/support/java/liquid/support/lottie/utils/MeanCalculator.java
similarity index 91%
rename from support/java/aoscp/support/lottie/utils/MeanCalculator.java
rename to support/java/liquid/support/lottie/utils/MeanCalculator.java
index 710b7bb..a4999a3 100644
--- a/support/java/aoscp/support/lottie/utils/MeanCalculator.java
+++ b/support/java/liquid/support/lottie/utils/MeanCalculator.java
@@ -1,4 +1,4 @@
-package aoscp.support.lottie.utils;
+package liquid.support.lottie.utils;
 
 /**
  * Class to calculate the average in a stream of numbers on a continuous basis.
diff --git a/support/java/aoscp/support/lottie/utils/MiscUtils.java b/support/java/liquid/support/lottie/utils/MiscUtils.java
similarity index 93%
rename from support/java/aoscp/support/lottie/utils/MiscUtils.java
rename to support/java/liquid/support/lottie/utils/MiscUtils.java
index 6f12393..b36fe04 100644
--- a/support/java/aoscp/support/lottie/utils/MiscUtils.java
+++ b/support/java/liquid/support/lottie/utils/MiscUtils.java
@@ -1,13 +1,13 @@
-package aoscp.support.lottie.utils;
+package liquid.support.lottie.utils;
 
 import android.graphics.Path;
 import android.graphics.PointF;
 import android.support.annotation.FloatRange;
 
-import aoscp.support.lottie.animation.content.KeyPathElementContent;
-import aoscp.support.lottie.model.CubicCurveData;
-import aoscp.support.lottie.model.KeyPath;
-import aoscp.support.lottie.model.content.ShapeData;
+import liquid.support.lottie.animation.content.KeyPathElementContent;
+import liquid.support.lottie.model.CubicCurveData;
+import liquid.support.lottie.model.KeyPath;
+import liquid.support.lottie.model.content.ShapeData;
 
 import java.util.List;
 
diff --git a/support/java/aoscp/support/lottie/utils/Utils.java b/support/java/liquid/support/lottie/utils/Utils.java
similarity index 97%
rename from support/java/aoscp/support/lottie/utils/Utils.java
rename to support/java/liquid/support/lottie/utils/Utils.java
index 7a68f44..0090deb 100644
--- a/support/java/aoscp/support/lottie/utils/Utils.java
+++ b/support/java/liquid/support/lottie/utils/Utils.java
@@ -1,4 +1,4 @@
-package aoscp.support.lottie.utils;
+package liquid.support.lottie.utils;
 
 import android.content.res.Resources;
 import android.graphics.Matrix;
@@ -7,8 +7,8 @@
 import android.graphics.PointF;
 import android.support.annotation.Nullable;
 
-import aoscp.support.lottie.L;
-import aoscp.support.lottie.animation.content.TrimPathContent;
+import liquid.support.lottie.L;
+import liquid.support.lottie.animation.content.TrimPathContent;
 
 import java.io.Closeable;
 
diff --git a/support/java/aoscp/support/lottie/utils/package-info.java b/support/java/liquid/support/lottie/utils/package-info.java
similarity index 78%
rename from support/java/aoscp/support/lottie/utils/package-info.java
rename to support/java/liquid/support/lottie/utils/package-info.java
index ba38ad7..94240a2 100644
--- a/support/java/aoscp/support/lottie/utils/package-info.java
+++ b/support/java/liquid/support/lottie/utils/package-info.java
@@ -1,5 +1,5 @@
 @RestrictTo(LIBRARY)
-package aoscp.support.lottie.utils;
+package liquid.support.lottie.utils;
 
 import android.support.annotation.RestrictTo;
 
diff --git a/support/java/aoscp/support/lottie/value/Keyframe.java b/support/java/liquid/support/lottie/value/Keyframe.java
similarity index 96%
rename from support/java/aoscp/support/lottie/value/Keyframe.java
rename to support/java/liquid/support/lottie/value/Keyframe.java
index 9390fc9..7939444 100644
--- a/support/java/aoscp/support/lottie/value/Keyframe.java
+++ b/support/java/liquid/support/lottie/value/Keyframe.java
@@ -1,11 +1,11 @@
-package aoscp.support.lottie.value;
+package liquid.support.lottie.value;
 
 import android.graphics.PointF;
 import android.support.annotation.FloatRange;
 import android.support.annotation.Nullable;
 import android.view.animation.Interpolator;
 
-import aoscp.support.lottie.LottieComposition;
+import liquid.support.lottie.LottieComposition;
 
 public class Keyframe<T> {
   @Nullable private final LottieComposition composition;
diff --git a/support/java/aoscp/support/lottie/value/LottieFrameInfo.java b/support/java/liquid/support/lottie/value/LottieFrameInfo.java
similarity index 97%
rename from support/java/aoscp/support/lottie/value/LottieFrameInfo.java
rename to support/java/liquid/support/lottie/value/LottieFrameInfo.java
index 0cc5b2f..15a8727 100644
--- a/support/java/aoscp/support/lottie/value/LottieFrameInfo.java
+++ b/support/java/liquid/support/lottie/value/LottieFrameInfo.java
@@ -1,4 +1,4 @@
-package aoscp.support.lottie.value;
+package liquid.support.lottie.value;
 
 import android.support.annotation.RestrictTo;
 
diff --git a/support/java/aoscp/support/lottie/value/LottieInterpolatedFloatValue.java b/support/java/liquid/support/lottie/value/LottieInterpolatedFloatValue.java
similarity index 87%
rename from support/java/aoscp/support/lottie/value/LottieInterpolatedFloatValue.java
rename to support/java/liquid/support/lottie/value/LottieInterpolatedFloatValue.java
index e0133a0..eec107d 100644
--- a/support/java/aoscp/support/lottie/value/LottieInterpolatedFloatValue.java
+++ b/support/java/liquid/support/lottie/value/LottieInterpolatedFloatValue.java
@@ -1,8 +1,8 @@
-package aoscp.support.lottie.value;
+package liquid.support.lottie.value;
 
 import android.view.animation.Interpolator;
 
-import aoscp.support.lottie.utils.MiscUtils;
+import liquid.support.lottie.utils.MiscUtils;
 
 @SuppressWarnings("unused")
 public class LottieInterpolatedFloatValue extends LottieInterpolatedValue<Float> {
diff --git a/support/java/aoscp/support/lottie/value/LottieInterpolatedIntegerValue.java b/support/java/liquid/support/lottie/value/LottieInterpolatedIntegerValue.java
similarity index 87%
rename from support/java/aoscp/support/lottie/value/LottieInterpolatedIntegerValue.java
rename to support/java/liquid/support/lottie/value/LottieInterpolatedIntegerValue.java
index bd7813a..0693ec2 100644
--- a/support/java/aoscp/support/lottie/value/LottieInterpolatedIntegerValue.java
+++ b/support/java/liquid/support/lottie/value/LottieInterpolatedIntegerValue.java
@@ -1,8 +1,8 @@
-package aoscp.support.lottie.value;
+package liquid.support.lottie.value;
 
 import android.view.animation.Interpolator;
 
-import aoscp.support.lottie.utils.MiscUtils;
+import liquid.support.lottie.utils.MiscUtils;
 
 @SuppressWarnings("unused")
 public class LottieInterpolatedIntegerValue extends LottieInterpolatedValue<Integer> {
diff --git a/support/java/aoscp/support/lottie/value/LottieInterpolatedPointValue.java b/support/java/liquid/support/lottie/value/LottieInterpolatedPointValue.java
similarity index 89%
rename from support/java/aoscp/support/lottie/value/LottieInterpolatedPointValue.java
rename to support/java/liquid/support/lottie/value/LottieInterpolatedPointValue.java
index 44b0f62..70128a2 100644
--- a/support/java/aoscp/support/lottie/value/LottieInterpolatedPointValue.java
+++ b/support/java/liquid/support/lottie/value/LottieInterpolatedPointValue.java
@@ -1,9 +1,9 @@
-package aoscp.support.lottie.value;
+package liquid.support.lottie.value;
 
 import android.graphics.PointF;
 import android.view.animation.Interpolator;
 
-import aoscp.support.lottie.utils.MiscUtils;
+import liquid.support.lottie.utils.MiscUtils;
 
 @SuppressWarnings("unused")
 public class LottieInterpolatedPointValue extends LottieInterpolatedValue<PointF> {
diff --git a/support/java/aoscp/support/lottie/value/LottieInterpolatedValue.java b/support/java/liquid/support/lottie/value/LottieInterpolatedValue.java
similarity index 95%
rename from support/java/aoscp/support/lottie/value/LottieInterpolatedValue.java
rename to support/java/liquid/support/lottie/value/LottieInterpolatedValue.java
index f33cccc..57543a3 100644
--- a/support/java/aoscp/support/lottie/value/LottieInterpolatedValue.java
+++ b/support/java/liquid/support/lottie/value/LottieInterpolatedValue.java
@@ -1,4 +1,4 @@
-package aoscp.support.lottie.value;
+package liquid.support.lottie.value;
 
 import android.view.animation.Interpolator;
 import android.view.animation.LinearInterpolator;
diff --git a/support/java/aoscp/support/lottie/value/LottieRelativeFloatValueCallback.java b/support/java/liquid/support/lottie/value/LottieRelativeFloatValueCallback.java
similarity index 92%
rename from support/java/aoscp/support/lottie/value/LottieRelativeFloatValueCallback.java
rename to support/java/liquid/support/lottie/value/LottieRelativeFloatValueCallback.java
index ab9f771..b16fe7b 100644
--- a/support/java/aoscp/support/lottie/value/LottieRelativeFloatValueCallback.java
+++ b/support/java/liquid/support/lottie/value/LottieRelativeFloatValueCallback.java
@@ -1,8 +1,8 @@
-package aoscp.support.lottie.value;
+package liquid.support.lottie.value;
 
 import android.support.annotation.NonNull;
 
-import aoscp.support.lottie.utils.MiscUtils;
+import liquid.support.lottie.utils.MiscUtils;
 
 /**
  * {@link LottieValueCallback} that provides a value offset from the original animation
diff --git a/support/java/aoscp/support/lottie/value/LottieRelativeIntegerValueCallback.java b/support/java/liquid/support/lottie/value/LottieRelativeIntegerValueCallback.java
similarity index 91%
rename from support/java/aoscp/support/lottie/value/LottieRelativeIntegerValueCallback.java
rename to support/java/liquid/support/lottie/value/LottieRelativeIntegerValueCallback.java
index ae4ab32..6ab70bc 100644
--- a/support/java/aoscp/support/lottie/value/LottieRelativeIntegerValueCallback.java
+++ b/support/java/liquid/support/lottie/value/LottieRelativeIntegerValueCallback.java
@@ -1,6 +1,6 @@
-package aoscp.support.lottie.value;
+package liquid.support.lottie.value;
 
-import aoscp.support.lottie.utils.MiscUtils;
+import liquid.support.lottie.utils.MiscUtils;
 
 /**
  * {@link LottieValueCallback} that provides a value offset from the original animation
diff --git a/support/java/aoscp/support/lottie/value/LottieRelativePointValueCallback.java b/support/java/liquid/support/lottie/value/LottieRelativePointValueCallback.java
similarity index 94%
rename from support/java/aoscp/support/lottie/value/LottieRelativePointValueCallback.java
rename to support/java/liquid/support/lottie/value/LottieRelativePointValueCallback.java
index 06c082d..1c7bc8e 100644
--- a/support/java/aoscp/support/lottie/value/LottieRelativePointValueCallback.java
+++ b/support/java/liquid/support/lottie/value/LottieRelativePointValueCallback.java
@@ -1,9 +1,9 @@
-package aoscp.support.lottie.value;
+package liquid.support.lottie.value;
 
 import android.graphics.PointF;
 import android.support.annotation.NonNull;
 
-import aoscp.support.lottie.utils.MiscUtils;
+import liquid.support.lottie.utils.MiscUtils;
 
 /**
  * {@link LottieValueCallback} that provides a value offset from the original animation
diff --git a/support/java/aoscp/support/lottie/value/LottieValueCallback.java b/support/java/liquid/support/lottie/value/LottieValueCallback.java
similarity index 88%
rename from support/java/aoscp/support/lottie/value/LottieValueCallback.java
rename to support/java/liquid/support/lottie/value/LottieValueCallback.java
index f45f636..1bfdda5 100644
--- a/support/java/aoscp/support/lottie/value/LottieValueCallback.java
+++ b/support/java/liquid/support/lottie/value/LottieValueCallback.java
@@ -1,13 +1,13 @@
-package aoscp.support.lottie.value;
+package liquid.support.lottie.value;
 
 
 import android.support.annotation.Nullable;
 import android.support.annotation.RestrictTo;
 
-import aoscp.support.lottie.animation.keyframe.BaseKeyframeAnimation;
+import liquid.support.lottie.animation.keyframe.BaseKeyframeAnimation;
 
 /**
- * Allows you to set a callback on a resolved {@link aoscp.support.lottie.model.KeyPath} to modify
+ * Allows you to set a callback on a resolved {@link liquid.support.lottie.model.KeyPath} to modify
  * its animation values at runtime.
  */
 public class LottieValueCallback<T> {
diff --git a/support/java/aoscp/support/lottie/value/ScaleXY.java b/support/java/liquid/support/lottie/value/ScaleXY.java
similarity index 91%
rename from support/java/aoscp/support/lottie/value/ScaleXY.java
rename to support/java/liquid/support/lottie/value/ScaleXY.java
index 74ec8e0..7c667cd 100644
--- a/support/java/aoscp/support/lottie/value/ScaleXY.java
+++ b/support/java/liquid/support/lottie/value/ScaleXY.java
@@ -1,4 +1,4 @@
-package aoscp.support.lottie.value;
+package liquid.support.lottie.value;
 
 public class ScaleXY {
   private final float scaleX;
diff --git a/support/java/aoscp/support/lottie/value/SimpleLottieValueCallback.java b/support/java/liquid/support/lottie/value/SimpleLottieValueCallback.java
similarity index 91%
rename from support/java/aoscp/support/lottie/value/SimpleLottieValueCallback.java
rename to support/java/liquid/support/lottie/value/SimpleLottieValueCallback.java
index d167eb2..b96974e 100644
--- a/support/java/aoscp/support/lottie/value/SimpleLottieValueCallback.java
+++ b/support/java/liquid/support/lottie/value/SimpleLottieValueCallback.java
@@ -1,4 +1,4 @@
-package aoscp.support.lottie.value;
+package liquid.support.lottie.value;
 
 /**
  * Delegate interface for {@link LottieValueCallback}. This is helpful for the Kotlin API because you can use a SAM conversion to write the
diff --git a/support/tests/java/com/airbnb/lottie/Fixtures.java b/support/tests/java/com/airbnb/lottie/Fixtures.java
index 17188ea..94cf04a 100644
--- a/support/tests/java/com/airbnb/lottie/Fixtures.java
+++ b/support/tests/java/com/airbnb/lottie/Fixtures.java
@@ -1,4 +1,4 @@
-package aoscp.support.lottie;
+package liquid.support.lottie;
 
 class Fixtures {
   static final String SQUARES = "{\"v\":\"4.11.1\",\"fr\":29.9700012207031,\"ip\":0," +
diff --git a/support/tests/java/com/airbnb/lottie/KeyPathTest.java b/support/tests/java/com/airbnb/lottie/KeyPathTest.java
index a54b9b3..9ed38c1 100644
--- a/support/tests/java/com/airbnb/lottie/KeyPathTest.java
+++ b/support/tests/java/com/airbnb/lottie/KeyPathTest.java
@@ -1,8 +1,8 @@
-package aoscp.support.lottie;
+package liquid.support.lottie;
 
 import android.util.JsonReader;
 
-import aoscp.support.lottie.model.KeyPath;
+import liquid.support.lottie.model.KeyPath;
 
 import org.junit.Before;
 import org.junit.Test;
diff --git a/support/tests/java/com/airbnb/lottie/LottieValueAnimatorUnitTest.java b/support/tests/java/com/airbnb/lottie/LottieValueAnimatorUnitTest.java
index 75cbc28..a7d31ae 100644
--- a/support/tests/java/com/airbnb/lottie/LottieValueAnimatorUnitTest.java
+++ b/support/tests/java/com/airbnb/lottie/LottieValueAnimatorUnitTest.java
@@ -1,4 +1,4 @@
-package aoscp.support.lottie;
+package liquid.support.lottie;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
@@ -6,10 +6,10 @@
 import android.support.v4.util.LongSparseArray;
 import android.support.v4.util.SparseArrayCompat;
 
-import aoscp.support.lottie.model.Font;
-import aoscp.support.lottie.model.FontCharacter;
-import aoscp.support.lottie.model.layer.Layer;
-import aoscp.support.lottie.utils.LottieValueAnimator;
+import liquid.support.lottie.model.Font;
+import liquid.support.lottie.model.FontCharacter;
+import liquid.support.lottie.model.layer.Layer;
+import liquid.support.lottie.utils.LottieValueAnimator;
 
 import org.junit.Before;
 import org.junit.Test;
diff --git a/support/tests/java/com/airbnb/lottie/MeanCalculatorTest.java b/support/tests/java/com/airbnb/lottie/MeanCalculatorTest.java
index efcf0c1..4a9ff6b 100644
--- a/support/tests/java/com/airbnb/lottie/MeanCalculatorTest.java
+++ b/support/tests/java/com/airbnb/lottie/MeanCalculatorTest.java
@@ -1,6 +1,6 @@
-package aoscp.support.lottie;
+package liquid.support.lottie;
 
-import aoscp.support.lottie.utils.MeanCalculator;
+import liquid.support.lottie.utils.MeanCalculator;
 
 import org.junit.Before;
 import org.junit.Test;
diff --git a/support/tests/java/com/airbnb/lottie/PerformanceTrackerTest.java b/support/tests/java/com/airbnb/lottie/PerformanceTrackerTest.java
index 7abff9b..ad8c3c6 100644
--- a/support/tests/java/com/airbnb/lottie/PerformanceTrackerTest.java
+++ b/support/tests/java/com/airbnb/lottie/PerformanceTrackerTest.java
@@ -1,4 +1,4 @@
-package aoscp.support.lottie;
+package liquid.support.lottie;
 
 import android.support.v4.util.Pair;