diff --git a/jni/NativeFormats/util/AndroidUtil.cpp b/jni/NativeFormats/util/AndroidUtil.cpp
index 5b8ec8d98..651d39434 100644
--- a/jni/NativeFormats/util/AndroidUtil.cpp
+++ b/jni/NativeFormats/util/AndroidUtil.cpp
@@ -31,9 +31,9 @@ const char * const AndroidUtil::Class_java_io_PrintStream = "java/io/PrintStream
 const char * const AndroidUtil::Class_ZLibrary = "org/geometerplus/zlibrary/core/library/ZLibrary";
 const char * const AndroidUtil::Class_NativeFormatPlugin = "org/geometerplus/fbreader/formats/NativeFormatPlugin";
 const char * const AndroidUtil::Class_PluginCollection = "org/geometerplus/fbreader/formats/PluginCollection";
-const char * const AndroidUtil::Class_Encoding = "org/geometerplus/fbreader/formats/Encoding";
-const char * const AndroidUtil::Class_EncodingConverter = "org/geometerplus/fbreader/formats/EncodingConverter";
-const char * const AndroidUtil::Class_JavaEncodingCollection = "org/geometerplus/fbreader/formats/JavaEncodingCollection";
+const char * const AndroidUtil::Class_Encoding = "org/geometerplus/zlibrary/core/encodings/Encoding";
+const char * const AndroidUtil::Class_EncodingConverter = "org/geometerplus/zlibrary/core/encodings/EncodingConverter";
+const char * const AndroidUtil::Class_JavaEncodingCollection = "org/geometerplus/zlibrary/core/encodings/JavaEncodingCollection";
 const char * const AndroidUtil::Class_Paths = "org/geometerplus/fbreader/Paths";
 const char * const AndroidUtil::Class_ZLFile = "org/geometerplus/zlibrary/core/filesystem/ZLFile";
 const char * const AndroidUtil::Class_Book = "org/geometerplus/fbreader/library/Book";
@@ -163,7 +163,7 @@ bool AndroidUtil::init(JavaVM* jvm) {
 	env->DeleteLocalRef(cls);
 
 	CHECK_NULL( cls = env->FindClass(Class_Encoding) );
-	CHECK_NULL( MID_Encoding_createConverter = env->GetMethodID(cls, "createConverter", "()Lorg/geometerplus/fbreader/formats/EncodingConverter;") );
+	CHECK_NULL( MID_Encoding_createConverter = env->GetMethodID(cls, "createConverter", "()Lorg/geometerplus/zlibrary/core/encodings/EncodingConverter;") );
 	env->DeleteLocalRef(cls);
 
 	CHECK_NULL( cls = env->FindClass(Class_EncodingConverter) );
@@ -173,9 +173,9 @@ bool AndroidUtil::init(JavaVM* jvm) {
 	env->DeleteLocalRef(cls);
 
 	CHECK_NULL( cls = env->FindClass(Class_JavaEncodingCollection) );
-	CHECK_NULL( SMID_JavaEncodingCollection_Instance = env->GetStaticMethodID(cls, "Instance", "()Lorg/geometerplus/fbreader/formats/JavaEncodingCollection;") );
-	CHECK_NULL( MID_JavaEncodingCollection_getEncoding_String = env->GetMethodID(cls, "getEncoding", "(Ljava/lang/String;)Lorg/geometerplus/fbreader/formats/Encoding;") );
-	CHECK_NULL( MID_JavaEncodingCollection_getEncoding_int = env->GetMethodID(cls, "getEncoding", "(I)Lorg/geometerplus/fbreader/formats/Encoding;") );
+	CHECK_NULL( SMID_JavaEncodingCollection_Instance = env->GetStaticMethodID(cls, "Instance", "()Lorg/geometerplus/zlibrary/core/encodings/JavaEncodingCollection;") );
+	CHECK_NULL( MID_JavaEncodingCollection_getEncoding_String = env->GetMethodID(cls, "getEncoding", "(Ljava/lang/String;)Lorg/geometerplus/zlibrary/core/encodings/Encoding;") );
+	CHECK_NULL( MID_JavaEncodingCollection_getEncoding_int = env->GetMethodID(cls, "getEncoding", "(I)Lorg/geometerplus/zlibrary/core/encodings/Encoding;") );
 	CHECK_NULL( MID_JavaEncodingCollection_providesConverterFor = env->GetMethodID(cls, "providesConverterFor", "(Ljava/lang/String;)Z") );
 	env->DeleteLocalRef(cls);
 
diff --git a/proguard.cfg b/proguard.cfg
index fbdc13aa6..f45c0a9c1 100755
--- a/proguard.cfg
+++ b/proguard.cfg
@@ -35,18 +35,18 @@
 -keepclassmembers class org.geometerplus.fbreader.formats.FormatPlugin {
     public ** supportedFileType();
 }
--keep class org.geometerplus.fbreader.formats.Encoding
--keepclassmembers class org.geometerplus.fbreader.formats.Encoding {
+-keep class org.geometerplus.zlibrary.core.encodings.Encoding
+-keepclassmembers class org.geometerplus.zlibrary.core.encodings.Encoding {
 		public ** createConverter();
 }
--keep class org.geometerplus.fbreader.formats.EncodingConverter
--keepclassmembers class org.geometerplus.fbreader.formats.EncodingConverter {
+-keep class org.geometerplus.zlibrary.core.encodings.EncodingConverter
+-keepclassmembers class org.geometerplus.zlibrary.core.encodings.EncodingConverter {
     public ** Name;
 		public int convert(byte[],int,int,byte[],int);
 		public void reset();
 }
--keep class org.geometerplus.fbreader.formats.JavaEncodingCollection
--keepclassmembers class org.geometerplus.fbreader.formats.JavaEncodingCollection {
+-keep class org.geometerplus.zlibrary.core.encodings.JavaEncodingCollection
+-keepclassmembers class org.geometerplus.zlibrary.core.encodings.JavaEncodingCollection {
     public static ** Instance();
     public ** getEncoding(java.lang.String);
     public ** getEncoding(int);
diff --git a/src/org/geometerplus/android/fbreader/preferences/EditBookInfoActivity.java b/src/org/geometerplus/android/fbreader/preferences/EditBookInfoActivity.java
index ce05687a1..902c4f976 100644
--- a/src/org/geometerplus/android/fbreader/preferences/EditBookInfoActivity.java
+++ b/src/org/geometerplus/android/fbreader/preferences/EditBookInfoActivity.java
@@ -24,9 +24,10 @@ import java.util.*;
 import android.content.Context;
 import android.content.Intent;
 
-import org.geometerplus.zlibrary.core.resources.ZLResource;
-import org.geometerplus.zlibrary.core.language.ZLLanguageUtil;
 import org.geometerplus.zlibrary.core.filesystem.ZLFile;
+import org.geometerplus.zlibrary.core.encodings.Encoding;
+import org.geometerplus.zlibrary.core.language.ZLLanguageUtil;
+import org.geometerplus.zlibrary.core.resources.ZLResource;
 
 import org.geometerplus.zlibrary.text.hyphenation.ZLTextHyphenator;
 
diff --git a/src/org/geometerplus/fbreader/formats/FormatPlugin.java b/src/org/geometerplus/fbreader/formats/FormatPlugin.java
index 530d430eb..01483da75 100644
--- a/src/org/geometerplus/fbreader/formats/FormatPlugin.java
+++ b/src/org/geometerplus/fbreader/formats/FormatPlugin.java
@@ -20,6 +20,7 @@
 package org.geometerplus.fbreader.formats;
 
 import org.geometerplus.zlibrary.core.filesystem.ZLFile;
+import org.geometerplus.zlibrary.core.encodings.EncodingCollection;
 import org.geometerplus.zlibrary.core.image.ZLImage;
 
 import org.geometerplus.fbreader.bookmodel.BookModel;
diff --git a/src/org/geometerplus/fbreader/formats/NativeFormatPlugin.java b/src/org/geometerplus/fbreader/formats/NativeFormatPlugin.java
index 6de860146..f4ff8892c 100644
--- a/src/org/geometerplus/fbreader/formats/NativeFormatPlugin.java
+++ b/src/org/geometerplus/fbreader/formats/NativeFormatPlugin.java
@@ -20,6 +20,7 @@
 package org.geometerplus.fbreader.formats;
 
 import org.geometerplus.zlibrary.core.filesystem.ZLFile;
+import org.geometerplus.zlibrary.core.encodings.JavaEncodingCollection;
 import org.geometerplus.zlibrary.core.image.*;
 import org.geometerplus.zlibrary.core.util.MimeType;
 
@@ -103,7 +104,7 @@ public class NativeFormatPlugin extends FormatPlugin {
 	}
 
 	@Override
-	public EncodingCollection supportedEncodings() {
+	public JavaEncodingCollection supportedEncodings() {
 		// TODO: implement
 		return JavaEncodingCollection.Instance();
 	}
diff --git a/src/org/geometerplus/fbreader/formats/fb2/FB2Plugin.java b/src/org/geometerplus/fbreader/formats/fb2/FB2Plugin.java
index 440e8f3bc..82fe2c8c0 100644
--- a/src/org/geometerplus/fbreader/formats/fb2/FB2Plugin.java
+++ b/src/org/geometerplus/fbreader/formats/fb2/FB2Plugin.java
@@ -20,6 +20,7 @@
 package org.geometerplus.fbreader.formats.fb2;
 
 import org.geometerplus.zlibrary.core.filesystem.ZLFile;
+import org.geometerplus.zlibrary.core.encodings.AutoEncodingCollection;
 import org.geometerplus.zlibrary.core.image.ZLImage;
 
 import org.geometerplus.fbreader.bookmodel.BookModel;
@@ -53,7 +54,7 @@ public class FB2Plugin extends JavaFormatPlugin {
 	}
 
 	@Override
-	public EncodingCollection supportedEncodings() {
+	public AutoEncodingCollection supportedEncodings() {
 		return new AutoEncodingCollection();
 	}
 
diff --git a/src/org/geometerplus/fbreader/formats/oeb/OEBPlugin.java b/src/org/geometerplus/fbreader/formats/oeb/OEBPlugin.java
index aad6e4c58..dd4b46d95 100644
--- a/src/org/geometerplus/fbreader/formats/oeb/OEBPlugin.java
+++ b/src/org/geometerplus/fbreader/formats/oeb/OEBPlugin.java
@@ -20,6 +20,7 @@
 package org.geometerplus.fbreader.formats.oeb;
 
 import org.geometerplus.zlibrary.core.filesystem.*;
+import org.geometerplus.zlibrary.core.encodings.AutoEncodingCollection;
 import org.geometerplus.zlibrary.core.image.ZLImage;
 
 import org.geometerplus.fbreader.bookmodel.BookModel;
@@ -85,7 +86,7 @@ public class OEBPlugin extends JavaFormatPlugin {
 	}
 
 	@Override
-	public EncodingCollection supportedEncodings() {
+	public AutoEncodingCollection supportedEncodings() {
 		return new AutoEncodingCollection();
 	}
 
diff --git a/src/org/geometerplus/fbreader/formats/pdb/MobipocketPlugin.java b/src/org/geometerplus/fbreader/formats/pdb/MobipocketPlugin.java
index bb63708bb..e219c725f 100644
--- a/src/org/geometerplus/fbreader/formats/pdb/MobipocketPlugin.java
+++ b/src/org/geometerplus/fbreader/formats/pdb/MobipocketPlugin.java
@@ -23,13 +23,15 @@ import java.io.*;
 
 import org.geometerplus.zlibrary.core.filesystem.ZLFile;
 import org.geometerplus.zlibrary.core.image.*;
+import org.geometerplus.zlibrary.core.encodings.Encoding;
+import org.geometerplus.zlibrary.core.encodings.JavaEncodingCollection;
 import org.geometerplus.zlibrary.core.language.ZLLanguageUtil;
 import org.geometerplus.zlibrary.core.util.MimeType;
 
 import org.geometerplus.fbreader.library.Book;
 import org.geometerplus.fbreader.bookmodel.BookModel;
 import org.geometerplus.fbreader.bookmodel.BookReadingException;
-import org.geometerplus.fbreader.formats.*;
+import org.geometerplus.fbreader.formats.JavaFormatPlugin;
 
 public class MobipocketPlugin extends JavaFormatPlugin {
 	public MobipocketPlugin() {
@@ -245,7 +247,7 @@ public class MobipocketPlugin extends JavaFormatPlugin {
 	}
 
 	@Override
-	public EncodingCollection supportedEncodings() {
+	public JavaEncodingCollection supportedEncodings() {
 		return JavaEncodingCollection.Instance();
 	}
 
diff --git a/src/org/geometerplus/fbreader/formats/AutoEncodingCollection.java b/src/org/geometerplus/zlibrary/core/encodings/AutoEncodingCollection.java
similarity index 96%
rename from src/org/geometerplus/fbreader/formats/AutoEncodingCollection.java
rename to src/org/geometerplus/zlibrary/core/encodings/AutoEncodingCollection.java
index f1035dce0..b8d13ef4b 100644
--- a/src/org/geometerplus/fbreader/formats/AutoEncodingCollection.java
+++ b/src/org/geometerplus/zlibrary/core/encodings/AutoEncodingCollection.java
@@ -17,7 +17,7 @@
  * 02110-1301, USA.
  */
 
-package org.geometerplus.fbreader.formats;
+package org.geometerplus.zlibrary.core.encodings;
 
 import java.util.List;
 import java.util.Collections;
diff --git a/src/org/geometerplus/fbreader/formats/Encoding.java b/src/org/geometerplus/zlibrary/core/encodings/Encoding.java
similarity index 96%
rename from src/org/geometerplus/fbreader/formats/Encoding.java
rename to src/org/geometerplus/zlibrary/core/encodings/Encoding.java
index 7c7e5cbbe..89e1335a2 100644
--- a/src/org/geometerplus/fbreader/formats/Encoding.java
+++ b/src/org/geometerplus/zlibrary/core/encodings/Encoding.java
@@ -17,7 +17,7 @@
  * 02110-1301, USA.
  */
 
-package org.geometerplus.fbreader.formats;
+package org.geometerplus.zlibrary.core.encodings;
 
 public final class Encoding {
 	public final String Family;
diff --git a/src/org/geometerplus/fbreader/formats/EncodingCollection.java b/src/org/geometerplus/zlibrary/core/encodings/EncodingCollection.java
similarity index 95%
rename from src/org/geometerplus/fbreader/formats/EncodingCollection.java
rename to src/org/geometerplus/zlibrary/core/encodings/EncodingCollection.java
index b369af704..673c57792 100644
--- a/src/org/geometerplus/fbreader/formats/EncodingCollection.java
+++ b/src/org/geometerplus/zlibrary/core/encodings/EncodingCollection.java
@@ -17,7 +17,7 @@
  * 02110-1301, USA.
  */
 
-package org.geometerplus.fbreader.formats;
+package org.geometerplus.zlibrary.core.encodings;
 
 import java.util.List;
 
diff --git a/src/org/geometerplus/fbreader/formats/EncodingConverter.java b/src/org/geometerplus/zlibrary/core/encodings/EncodingConverter.java
similarity index 97%
rename from src/org/geometerplus/fbreader/formats/EncodingConverter.java
rename to src/org/geometerplus/zlibrary/core/encodings/EncodingConverter.java
index 265c6eb3a..c45d473bb 100644
--- a/src/org/geometerplus/fbreader/formats/EncodingConverter.java
+++ b/src/org/geometerplus/zlibrary/core/encodings/EncodingConverter.java
@@ -17,7 +17,7 @@
  * 02110-1301, USA.
  */
 
-package org.geometerplus.fbreader.formats;
+package org.geometerplus.zlibrary.core.encodings;
 
 import java.nio.*;
 import java.nio.charset.*;
diff --git a/src/org/geometerplus/fbreader/formats/FilteredEncodingCollection.java b/src/org/geometerplus/zlibrary/core/encodings/FilteredEncodingCollection.java
similarity index 98%
rename from src/org/geometerplus/fbreader/formats/FilteredEncodingCollection.java
rename to src/org/geometerplus/zlibrary/core/encodings/FilteredEncodingCollection.java
index 7804b5108..8600c6f3a 100644
--- a/src/org/geometerplus/fbreader/formats/FilteredEncodingCollection.java
+++ b/src/org/geometerplus/zlibrary/core/encodings/FilteredEncodingCollection.java
@@ -17,7 +17,7 @@
  * 02110-1301, USA.
  */
 
-package org.geometerplus.fbreader.formats;
+package org.geometerplus.zlibrary.core.encodings;
 
 import java.util.*;
 
diff --git a/src/org/geometerplus/fbreader/formats/JavaEncodingCollection.java b/src/org/geometerplus/zlibrary/core/encodings/JavaEncodingCollection.java
similarity index 96%
rename from src/org/geometerplus/fbreader/formats/JavaEncodingCollection.java
rename to src/org/geometerplus/zlibrary/core/encodings/JavaEncodingCollection.java
index d560e8bb0..525ab728c 100644
--- a/src/org/geometerplus/fbreader/formats/JavaEncodingCollection.java
+++ b/src/org/geometerplus/zlibrary/core/encodings/JavaEncodingCollection.java
@@ -17,7 +17,7 @@
  * 02110-1301, USA.
  */
 
-package org.geometerplus.fbreader.formats;
+package org.geometerplus.zlibrary.core.encodings;
 
 import java.nio.charset.Charset;