diff --git a/.classpath b/.classpath
index 7a4eb17..47832e9 100644
--- a/.classpath
+++ b/.classpath
@@ -7,22 +7,22 @@
 	<classpathentry kind="src" path="test/unit"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry exported="true" kind="con" path="GROOVY_DSL_SUPPORT"/>
-	<classpathentry excluding="BuildConfig.groovy|*DataSource.groovy|UrlMappings.groovy|Config.groovy|BootStrap.groovy|spring/resources.groovy" kind="src" path=".link_to_grails_plugins/asset-pipeline-2.0.13/grails-app/conf">
+	<classpathentry excluding="BuildConfig.groovy|*DataSource.groovy|UrlMappings.groovy|Config.groovy|BootStrap.groovy|spring/resources.groovy" kind="src" path=".link_to_grails_plugins/asset-pipeline-2.0.21/grails-app/conf">
 		<attributes>
 			<attribute name="org.grails.ide.eclipse.core.SOURCE_FOLDER" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="src" path=".link_to_grails_plugins/asset-pipeline-2.0.13/grails-app/services">
+	<classpathentry kind="src" path=".link_to_grails_plugins/asset-pipeline-2.0.21/grails-app/services">
 		<attributes>
 			<attribute name="org.grails.ide.eclipse.core.SOURCE_FOLDER" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="src" path=".link_to_grails_plugins/asset-pipeline-2.0.13/grails-app/taglib">
+	<classpathentry kind="src" path=".link_to_grails_plugins/asset-pipeline-2.0.21/grails-app/taglib">
 		<attributes>
 			<attribute name="org.grails.ide.eclipse.core.SOURCE_FOLDER" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="src" path=".link_to_grails_plugins/asset-pipeline-2.0.13/src/groovy">
+	<classpathentry kind="src" path=".link_to_grails_plugins/asset-pipeline-2.0.21/src/groovy">
 		<attributes>
 			<attribute name="org.grails.ide.eclipse.core.SOURCE_FOLDER" value="true"/>
 		</attributes>
diff --git a/grails-app/conf/BuildConfig.groovy b/grails-app/conf/BuildConfig.groovy
index f9f5441..8744d5c 100644
--- a/grails-app/conf/BuildConfig.groovy
+++ b/grails-app/conf/BuildConfig.groovy
@@ -1,7 +1,7 @@
 /*
  * BuildConfig.groovy
  *
- * Copyright (c) 2014, Daniel Ellermann
+ * Copyright (c) 2014-2015, Daniel Ellermann
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -31,7 +31,7 @@ grails.project.dependency.resolution = {
     dependencies {}
 
     plugins {
-        runtime ':asset-pipeline:2.0.13'
+        runtime ':asset-pipeline:2.0.21'
 
         build ':release:3.0.1', ':rest-client-builder:1.0.3', {
             export = false
diff --git a/grails-app/taglib/asset/pipeline/I18nTagLib.groovy b/grails-app/taglib/asset/pipeline/i18n/I18nTagLib.groovy
similarity index 94%
rename from grails-app/taglib/asset/pipeline/I18nTagLib.groovy
rename to grails-app/taglib/asset/pipeline/i18n/I18nTagLib.groovy
index eeaba89..fda9f17 100644
--- a/grails-app/taglib/asset/pipeline/I18nTagLib.groovy
+++ b/grails-app/taglib/asset/pipeline/i18n/I18nTagLib.groovy
@@ -1,7 +1,7 @@
 /*
  * I18nTagLib.groovy
  *
- * Copyright (c) 2014, Daniel Ellermann
+ * Copyright (c) 2014-2015, Daniel Ellermann
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,8 +17,10 @@
  */
 
 
-package asset.pipeline
+package asset.pipeline.i18n
 
+import asset.pipeline.AssetFile
+import asset.pipeline.AssetHelper
 import org.codehaus.groovy.grails.commons.GrailsApplication