diff --git a/jni/NativeFormats/util/AndroidUtil.cpp b/jni/NativeFormats/util/AndroidUtil.cpp
index 6d39423db..031f92d2c 100644
--- a/jni/NativeFormats/util/AndroidUtil.cpp
+++ b/jni/NativeFormats/util/AndroidUtil.cpp
@@ -47,8 +47,8 @@ JavaClass AndroidUtil::Class_JavaEncodingCollection("org/geometerplus/zlibrary/c
 JavaClass AndroidUtil::Class_NativeFormatPlugin("org/geometerplus/fbreader/formats/NativeFormatPlugin");
 JavaClass AndroidUtil::Class_PluginCollection("org/geometerplus/fbreader/formats/PluginCollection");
 JavaClass AndroidUtil::Class_Paths("org/geometerplus/fbreader/Paths");
-JavaClass AndroidUtil::Class_Book("org/geometerplus/fbreader/library/Book");
-JavaClass AndroidUtil::Class_Tag("org/geometerplus/fbreader/library/Tag");
+JavaClass AndroidUtil::Class_Book("org/geometerplus/fbreader/book/Book");
+JavaClass AndroidUtil::Class_Tag("org/geometerplus/fbreader/book/Tag");
 JavaClass AndroidUtil::Class_NativeBookModel("org/geometerplus/fbreader/bookmodel/NativeBookModel");
 
 shared_ptr<StringMethod> AndroidUtil::Method_java_lang_String_toLowerCase;
@@ -178,9 +178,9 @@ bool AndroidUtil::init(JavaVM* jvm) {
 	Method_Book_setLanguage = new VoidMethod(Class_Book, "setLanguage", "(Ljava/lang/String;)");
 	Method_Book_setEncoding = new VoidMethod(Class_Book, "setEncoding", "(Ljava/lang/String;)");
 	Method_Book_addAuthor = new VoidMethod(Class_Book, "addAuthor", "(Ljava/lang/String;Ljava/lang/String;)");
-	Method_Book_addTag = new VoidMethod(Class_Book, "addTag", "(Lorg/geometerplus/fbreader/library/Tag;)");
+	Method_Book_addTag = new VoidMethod(Class_Book, "addTag", "(Lorg/geometerplus/fbreader/book/Tag;)");
 
-	StaticMethod_Tag_getTag = new StaticObjectMethod(Class_Tag, "getTag", Class_Tag, "(Lorg/geometerplus/fbreader/library/Tag;Ljava/lang/String;)");
+	StaticMethod_Tag_getTag = new StaticObjectMethod(Class_Tag, "getTag", Class_Tag, "(Lorg/geometerplus/fbreader/book/Tag;Ljava/lang/String;)");
 
 	Field_NativeBookModel_Book = new ObjectField(Class_NativeBookModel, "Book", Class_Book);
 	Method_NativeBookModel_initInternalHyperlinks = new VoidMethod(Class_NativeBookModel, "initInternalHyperlinks", "(Ljava/lang/String;Ljava/lang/String;I)");
diff --git a/proguard.cfg b/proguard.cfg
index 7a3e46be8..b207cf19a 100755
--- a/proguard.cfg
+++ b/proguard.cfg
@@ -68,8 +68,8 @@
 -keepclassmembers class org.geometerplus.fbreader.Paths {
     public static ** cacheDirectory();
 }
--keep class org.geometerplus.fbreader.library.Book
--keepclassmembers class org.geometerplus.fbreader.library.Book {
+-keep class org.geometerplus.fbreader.book.Book
+-keepclassmembers class org.geometerplus.fbreader.book.Book {
     public ** File;
     public ** getTitle();
     public ** getLanguage();
@@ -82,8 +82,8 @@
     public void addTag(**);
     public boolean save();
 }
--keep class org.geometerplus.fbreader.library.Tag
--keepclassmembers class org.geometerplus.fbreader.library.Tag {
+-keep class org.geometerplus.fbreader.book.Tag
+-keepclassmembers class org.geometerplus.fbreader.book.Tag {
     public static ** getTag(**,**);
 }
 -keepclassmembers class org.geometerplus.fbreader.bookmodel.BookModelImpl {