diff --git a/src/org/geometerplus/android/fbreader/network/AddCustomCatalogActivity.java b/src/org/geometerplus/android/fbreader/network/AddCustomCatalogActivity.java
index f68b0b3dd..609bc2d48 100644
--- a/src/org/geometerplus/android/fbreader/network/AddCustomCatalogActivity.java
+++ b/src/org/geometerplus/android/fbreader/network/AddCustomCatalogActivity.java
@@ -39,6 +39,7 @@ import org.geometerplus.zlibrary.ui.android.R;
 
 import org.geometerplus.fbreader.network.*;
 import org.geometerplus.fbreader.network.opds.OPDSCustomLink;
+import org.geometerplus.fbreader.network.urlInfo.UrlInfoWithDate;
 
 import org.geometerplus.android.util.UIUtil;
 
diff --git a/src/org/geometerplus/android/fbreader/network/BookDownloader.java b/src/org/geometerplus/android/fbreader/network/BookDownloader.java
index b098235ad..b3dc2e3d1 100644
--- a/src/org/geometerplus/android/fbreader/network/BookDownloader.java
+++ b/src/org/geometerplus/android/fbreader/network/BookDownloader.java
@@ -26,8 +26,7 @@ import android.app.Activity;
 import android.net.Uri;
 import android.content.Intent;
 
-import org.geometerplus.fbreader.network.BookUrlInfo;
-
+import org.geometerplus.fbreader.network.urlInfo.BookUrlInfo;
 
 public class BookDownloader extends Activity {
 
diff --git a/src/org/geometerplus/android/fbreader/network/BookDownloaderService.java b/src/org/geometerplus/android/fbreader/network/BookDownloaderService.java
index 1403eb0b0..8146c0d8f 100644
--- a/src/org/geometerplus/android/fbreader/network/BookDownloaderService.java
+++ b/src/org/geometerplus/android/fbreader/network/BookDownloaderService.java
@@ -40,8 +40,8 @@ import org.geometerplus.zlibrary.ui.android.R;
 import org.geometerplus.zlibrary.core.resources.ZLResource;
 import org.geometerplus.zlibrary.core.network.*;
 
-import org.geometerplus.fbreader.network.UrlInfo;
-import org.geometerplus.fbreader.network.BookUrlInfo;
+import org.geometerplus.fbreader.network.urlInfo.UrlInfo;
+import org.geometerplus.fbreader.network.urlInfo.BookUrlInfo;
 
 import org.geometerplus.android.fbreader.FBReader;
 
diff --git a/src/org/geometerplus/android/fbreader/network/NetworkBookActions.java b/src/org/geometerplus/android/fbreader/network/NetworkBookActions.java
index bd9698f30..4e847e66e 100644
--- a/src/org/geometerplus/android/fbreader/network/NetworkBookActions.java
+++ b/src/org/geometerplus/android/fbreader/network/NetworkBookActions.java
@@ -42,6 +42,7 @@ import org.geometerplus.android.util.UIUtil;
 import org.geometerplus.android.fbreader.FBReader;
 
 import org.geometerplus.fbreader.network.*;
+import org.geometerplus.fbreader.network.urlInfo.*;
 import org.geometerplus.fbreader.network.tree.NetworkBookTree;
 import org.geometerplus.fbreader.network.tree.NetworkAuthorTree;
 import org.geometerplus.fbreader.network.tree.NetworkSeriesTree;
diff --git a/src/org/geometerplus/android/fbreader/network/NetworkCatalogActions.java b/src/org/geometerplus/android/fbreader/network/NetworkCatalogActions.java
index aa3b0aadf..e37d0feff 100644
--- a/src/org/geometerplus/android/fbreader/network/NetworkCatalogActions.java
+++ b/src/org/geometerplus/android/fbreader/network/NetworkCatalogActions.java
@@ -35,12 +35,12 @@ import org.geometerplus.android.util.UIUtil;
 import org.geometerplus.android.util.PackageUtil;
 
 import org.geometerplus.fbreader.network.*;
+import org.geometerplus.fbreader.network.authentication.*;
 import org.geometerplus.fbreader.network.tree.NetworkTreeFactory;
 import org.geometerplus.fbreader.network.tree.NetworkCatalogTree;
 import org.geometerplus.fbreader.network.tree.NetworkCatalogRootTree;
 import org.geometerplus.fbreader.network.opds.BasketItem;
-import org.geometerplus.fbreader.network.authentication.*;
-
+import org.geometerplus.fbreader.network.urlInfo.UrlInfo;
 
 class NetworkCatalogActions extends NetworkTreeActions {
 	public static final int OPEN_CATALOG_ITEM_ID = 0;
diff --git a/src/org/geometerplus/android/fbreader/network/NetworkLibraryActivity.java b/src/org/geometerplus/android/fbreader/network/NetworkLibraryActivity.java
index 629974a69..f8245e6d5 100644
--- a/src/org/geometerplus/android/fbreader/network/NetworkLibraryActivity.java
+++ b/src/org/geometerplus/android/fbreader/network/NetworkLibraryActivity.java
@@ -41,6 +41,7 @@ import org.geometerplus.android.util.UIUtil;
 
 import org.geometerplus.fbreader.network.*;
 import org.geometerplus.fbreader.network.opds.OPDSCustomLink;
+import org.geometerplus.fbreader.network.urlInfo.UrlInfoWithDate;
 
 public class NetworkLibraryActivity extends NetworkBaseActivity {
 	static final String ADD_CATALOG = "android.fbreader.action.ADD_CATALOG";
diff --git a/src/org/geometerplus/android/fbreader/network/SQLiteNetworkDatabase.java b/src/org/geometerplus/android/fbreader/network/SQLiteNetworkDatabase.java
index 227470afa..9f9823131 100644
--- a/src/org/geometerplus/android/fbreader/network/SQLiteNetworkDatabase.java
+++ b/src/org/geometerplus/android/fbreader/network/SQLiteNetworkDatabase.java
@@ -30,7 +30,7 @@ import org.geometerplus.zlibrary.ui.android.library.ZLAndroidApplication;
 
 import org.geometerplus.fbreader.network.ICustomNetworkLink;
 import org.geometerplus.fbreader.network.NetworkDatabase;
-import org.geometerplus.fbreader.network.UrlInfoWithDate;
+import org.geometerplus.fbreader.network.urlInfo.UrlInfoWithDate;
 
 import org.geometerplus.android.util.SQLiteUtil;
 
diff --git a/src/org/geometerplus/fbreader/network/AbstractNetworkLink.java b/src/org/geometerplus/fbreader/network/AbstractNetworkLink.java
index d399e2e90..33fc99bd7 100644
--- a/src/org/geometerplus/fbreader/network/AbstractNetworkLink.java
+++ b/src/org/geometerplus/fbreader/network/AbstractNetworkLink.java
@@ -24,6 +24,8 @@ import java.util.*;
 import org.geometerplus.zlibrary.core.util.ZLMiscUtil;
 import org.geometerplus.zlibrary.core.options.ZLStringListOption;
 
+import org.geometerplus.fbreader.network.urlInfo.UrlInfoWithDate;
+
 public abstract class AbstractNetworkLink implements INetworkLink, Basket {
 	protected String mySiteName;
 	protected String myTitle;
diff --git a/src/org/geometerplus/fbreader/network/ICustomNetworkLink.java b/src/org/geometerplus/fbreader/network/ICustomNetworkLink.java
index b5a649b17..2eec9873d 100644
--- a/src/org/geometerplus/fbreader/network/ICustomNetworkLink.java
+++ b/src/org/geometerplus/fbreader/network/ICustomNetworkLink.java
@@ -19,9 +19,11 @@
 
 package org.geometerplus.fbreader.network;
 
+import java.util.HashMap;
+
 import org.geometerplus.zlibrary.core.network.ZLNetworkException;
 
-import java.util.HashMap;
+import org.geometerplus.fbreader.network.urlInfo.UrlInfoWithDate;
 
 public interface ICustomNetworkLink extends INetworkLink {
 	public static final int INVALID_ID = -1;
diff --git a/src/org/geometerplus/fbreader/network/INetworkLink.java b/src/org/geometerplus/fbreader/network/INetworkLink.java
index f6f0f6f06..965548710 100644
--- a/src/org/geometerplus/fbreader/network/INetworkLink.java
+++ b/src/org/geometerplus/fbreader/network/INetworkLink.java
@@ -24,7 +24,7 @@ import java.util.*;
 import org.geometerplus.zlibrary.core.network.ZLNetworkRequest;
 
 import org.geometerplus.fbreader.network.authentication.NetworkAuthenticationManager;
-
+import org.geometerplus.fbreader.network.urlInfo.UrlInfoWithDate;
 
 public interface INetworkLink {
 	String URL_MAIN = "main";
diff --git a/src/org/geometerplus/fbreader/network/NetworkBookItem.java b/src/org/geometerplus/fbreader/network/NetworkBookItem.java
index 1ac0098ea..cf8f6bc2c 100644
--- a/src/org/geometerplus/fbreader/network/NetworkBookItem.java
+++ b/src/org/geometerplus/fbreader/network/NetworkBookItem.java
@@ -22,6 +22,7 @@ package org.geometerplus.fbreader.network;
 import java.util.*;
 import java.io.File;
 
+import org.geometerplus.fbreader.network.urlInfo.*;
 import org.geometerplus.fbreader.network.authentication.NetworkAuthenticationManager;
 
 public final class NetworkBookItem extends NetworkItem {
diff --git a/src/org/geometerplus/fbreader/network/NetworkCatalogItem.java b/src/org/geometerplus/fbreader/network/NetworkCatalogItem.java
index 6aaa79dce..a071f22bb 100644
--- a/src/org/geometerplus/fbreader/network/NetworkCatalogItem.java
+++ b/src/org/geometerplus/fbreader/network/NetworkCatalogItem.java
@@ -25,6 +25,7 @@ import org.geometerplus.zlibrary.core.util.ZLBoolean3;
 import org.geometerplus.zlibrary.core.network.ZLNetworkException;
 
 import org.geometerplus.fbreader.network.authentication.NetworkAuthenticationManager;
+import org.geometerplus.fbreader.network.urlInfo.UrlInfoCollection;
 
 public abstract class NetworkCatalogItem extends NetworkItem {
 	// bit mask for flags parameter
diff --git a/src/org/geometerplus/fbreader/network/NetworkDatabase.java b/src/org/geometerplus/fbreader/network/NetworkDatabase.java
index f4463f5d9..aa3a075ae 100644
--- a/src/org/geometerplus/fbreader/network/NetworkDatabase.java
+++ b/src/org/geometerplus/fbreader/network/NetworkDatabase.java
@@ -21,6 +21,8 @@ package org.geometerplus.fbreader.network;
 
 import java.util.Map;
 
+import org.geometerplus.fbreader.network.urlInfo.UrlInfoWithDate;
+
 public abstract class NetworkDatabase {
 	private static NetworkDatabase ourInstance;
 
diff --git a/src/org/geometerplus/fbreader/network/NetworkItem.java b/src/org/geometerplus/fbreader/network/NetworkItem.java
index 6b21d4c4d..46517984f 100644
--- a/src/org/geometerplus/fbreader/network/NetworkItem.java
+++ b/src/org/geometerplus/fbreader/network/NetworkItem.java
@@ -21,6 +21,9 @@ package org.geometerplus.fbreader.network;
 
 import java.util.*;
 
+import org.geometerplus.fbreader.network.urlInfo.UrlInfo;
+import org.geometerplus.fbreader.network.urlInfo.UrlInfoCollection;
+
 public abstract class NetworkItem {
 	public final INetworkLink Link;
 	public final String Title;
diff --git a/src/org/geometerplus/fbreader/network/NetworkLibrary.java b/src/org/geometerplus/fbreader/network/NetworkLibrary.java
index 58235341f..ecc78ac85 100644
--- a/src/org/geometerplus/fbreader/network/NetworkLibrary.java
+++ b/src/org/geometerplus/fbreader/network/NetworkLibrary.java
@@ -33,6 +33,7 @@ import org.geometerplus.fbreader.tree.FBTree;
 import org.geometerplus.fbreader.network.tree.*;
 import org.geometerplus.fbreader.network.opds.OPDSCustomLink;
 import org.geometerplus.fbreader.network.opds.OPDSLinkReader;
+import org.geometerplus.fbreader.network.urlInfo.UrlInfoWithDate;
 
 public class NetworkLibrary {
 	private static NetworkLibrary ourInstance;
diff --git a/src/org/geometerplus/fbreader/network/NetworkURLCatalogItem.java b/src/org/geometerplus/fbreader/network/NetworkURLCatalogItem.java
index c080877e7..4dfe2f5cf 100644
--- a/src/org/geometerplus/fbreader/network/NetworkURLCatalogItem.java
+++ b/src/org/geometerplus/fbreader/network/NetworkURLCatalogItem.java
@@ -23,6 +23,9 @@ import org.geometerplus.zlibrary.core.network.ZLNetworkException;
 import org.geometerplus.zlibrary.core.network.ZLNetworkManager;
 import org.geometerplus.zlibrary.core.network.ZLNetworkRequest;
 
+import org.geometerplus.fbreader.network.urlInfo.UrlInfo;
+import org.geometerplus.fbreader.network.urlInfo.UrlInfoCollection;
+
 public abstract class NetworkURLCatalogItem extends NetworkCatalogItem {
 	/**
 	 * Creates new NetworkURLCatalogItem instance with <code>Accessibility.ALWAYS</code> accessibility and <code>FLAGS_DEFAULT</code> flags.
diff --git a/src/org/geometerplus/fbreader/network/TopUpItem.java b/src/org/geometerplus/fbreader/network/TopUpItem.java
index 76842fef4..09c3cb0e1 100644
--- a/src/org/geometerplus/fbreader/network/TopUpItem.java
+++ b/src/org/geometerplus/fbreader/network/TopUpItem.java
@@ -19,10 +19,10 @@
 
 package org.geometerplus.fbreader.network;
 
-import java.util.Map;
-
 import org.geometerplus.zlibrary.core.resources.ZLResource;
 
+import org.geometerplus.fbreader.network.urlInfo.UrlInfoCollection;
+
 public class TopUpItem extends NetworkItem {
 	public TopUpItem(INetworkLink link, UrlInfoCollection urls) {
 		super(
diff --git a/src/org/geometerplus/fbreader/network/authentication/NetworkAuthenticationManager.java b/src/org/geometerplus/fbreader/network/authentication/NetworkAuthenticationManager.java
index d20c6d835..614e52142 100644
--- a/src/org/geometerplus/fbreader/network/authentication/NetworkAuthenticationManager.java
+++ b/src/org/geometerplus/fbreader/network/authentication/NetworkAuthenticationManager.java
@@ -25,9 +25,8 @@ import org.geometerplus.zlibrary.core.options.ZLStringOption;
 import org.geometerplus.zlibrary.core.network.ZLNetworkException;
 
 import org.geometerplus.fbreader.network.*;
-
 import org.geometerplus.fbreader.network.authentication.litres.LitResAuthenticationManager;
-
+import org.geometerplus.fbreader.network.urlInfo.BookUrlInfo;
 
 public abstract class NetworkAuthenticationManager {
 	private static final HashMap<String, NetworkAuthenticationManager> ourManagers = new HashMap<String, NetworkAuthenticationManager>();
diff --git a/src/org/geometerplus/fbreader/network/authentication/litres/LitResAuthenticationManager.java b/src/org/geometerplus/fbreader/network/authentication/litres/LitResAuthenticationManager.java
index fb7dfcfcc..f82b9d4a0 100644
--- a/src/org/geometerplus/fbreader/network/authentication/litres/LitResAuthenticationManager.java
+++ b/src/org/geometerplus/fbreader/network/authentication/litres/LitResAuthenticationManager.java
@@ -29,6 +29,7 @@ import org.geometerplus.zlibrary.core.network.ZLNetworkRequest;
 
 import org.geometerplus.fbreader.network.*;
 import org.geometerplus.fbreader.network.authentication.*;
+import org.geometerplus.fbreader.network.urlInfo.*;
 
 public class LitResAuthenticationManager extends NetworkAuthenticationManager {
 	private boolean mySidChecked;
diff --git a/src/org/geometerplus/fbreader/network/authentication/litres/LitResBookshelfItem.java b/src/org/geometerplus/fbreader/network/authentication/litres/LitResBookshelfItem.java
index 1085afe2f..6c3849940 100644
--- a/src/org/geometerplus/fbreader/network/authentication/litres/LitResBookshelfItem.java
+++ b/src/org/geometerplus/fbreader/network/authentication/litres/LitResBookshelfItem.java
@@ -25,6 +25,7 @@ import org.geometerplus.zlibrary.core.resources.ZLResource;
 import org.geometerplus.zlibrary.core.network.ZLNetworkException;
 
 import org.geometerplus.fbreader.network.*;
+import org.geometerplus.fbreader.network.urlInfo.UrlInfoCollection;
 
 abstract class SortedCatalogItem extends NetworkCatalogItem {
 	private final List<NetworkItem> myChildren = new LinkedList<NetworkItem>();
diff --git a/src/org/geometerplus/fbreader/network/authentication/litres/LitResRecommendationsItem.java b/src/org/geometerplus/fbreader/network/authentication/litres/LitResRecommendationsItem.java
index 7b5dfc8b9..4efbbdb04 100644
--- a/src/org/geometerplus/fbreader/network/authentication/litres/LitResRecommendationsItem.java
+++ b/src/org/geometerplus/fbreader/network/authentication/litres/LitResRecommendationsItem.java
@@ -23,6 +23,7 @@ import org.geometerplus.zlibrary.core.util.ZLNetworkUtil;
 
 import org.geometerplus.fbreader.network.*;
 import org.geometerplus.fbreader.network.opds.OPDSCatalogItem;
+import org.geometerplus.fbreader.network.urlInfo.*;
 
 public class LitResRecommendationsItem extends OPDSCatalogItem {
 	public LitResRecommendationsItem(INetworkLink link, String title, String summary, UrlInfoCollection urls, Accessibility accessibility) {
diff --git a/src/org/geometerplus/fbreader/network/authentication/litres/LitResXMLReader.java b/src/org/geometerplus/fbreader/network/authentication/litres/LitResXMLReader.java
index 6b6a7fa36..254368341 100644
--- a/src/org/geometerplus/fbreader/network/authentication/litres/LitResXMLReader.java
+++ b/src/org/geometerplus/fbreader/network/authentication/litres/LitResXMLReader.java
@@ -26,7 +26,7 @@ import org.geometerplus.zlibrary.core.xml.*;
 
 import org.geometerplus.fbreader.network.*;
 import org.geometerplus.fbreader.network.opds.HtmlToString;
-
+import org.geometerplus.fbreader.network.urlInfo.*;
 
 class LitResXMLReader extends LitResAuthenticationXMLReader {
 	public final INetworkLink Link;
diff --git a/src/org/geometerplus/fbreader/network/opds/BasketItem.java b/src/org/geometerplus/fbreader/network/opds/BasketItem.java
index 42cd9d357..a49de7c6a 100644
--- a/src/org/geometerplus/fbreader/network/opds/BasketItem.java
+++ b/src/org/geometerplus/fbreader/network/opds/BasketItem.java
@@ -21,8 +21,8 @@ package org.geometerplus.fbreader.network.opds;
 
 import org.geometerplus.zlibrary.core.util.ZLNetworkUtil;
 
-import org.geometerplus.fbreader.network.UrlInfo;
-import org.geometerplus.fbreader.network.UrlInfoCollection;
+import org.geometerplus.fbreader.network.urlInfo.UrlInfo;
+import org.geometerplus.fbreader.network.urlInfo.UrlInfoCollection;
 
 public class BasketItem extends OPDSCatalogItem {
 	BasketItem(OPDSNetworkLink link, String title, String summary, UrlInfoCollection urls, Accessibility accessibility) {
diff --git a/src/org/geometerplus/fbreader/network/opds/NetworkOPDSFeedReader.java b/src/org/geometerplus/fbreader/network/opds/NetworkOPDSFeedReader.java
index 3e1a96af0..414207946 100644
--- a/src/org/geometerplus/fbreader/network/opds/NetworkOPDSFeedReader.java
+++ b/src/org/geometerplus/fbreader/network/opds/NetworkOPDSFeedReader.java
@@ -28,6 +28,7 @@ import org.geometerplus.fbreader.network.*;
 import org.geometerplus.fbreader.network.atom.*;
 import org.geometerplus.fbreader.network.authentication.litres.LitResBookshelfItem;
 import org.geometerplus.fbreader.network.authentication.litres.LitResRecommendationsItem;
+import org.geometerplus.fbreader.network.urlInfo.*;
 
 class NetworkOPDSFeedReader implements OPDSFeedReader, OPDSConstants, MimeTypes {
 	private final String myBaseURL;
diff --git a/src/org/geometerplus/fbreader/network/opds/OPDSCatalogItem.java b/src/org/geometerplus/fbreader/network/opds/OPDSCatalogItem.java
index eba55c5d8..734c4c942 100644
--- a/src/org/geometerplus/fbreader/network/opds/OPDSCatalogItem.java
+++ b/src/org/geometerplus/fbreader/network/opds/OPDSCatalogItem.java
@@ -25,6 +25,7 @@ import org.geometerplus.zlibrary.core.network.ZLNetworkException;
 import org.geometerplus.zlibrary.core.network.ZLNetworkRequest;
 
 import org.geometerplus.fbreader.network.*;
+import org.geometerplus.fbreader.network.urlInfo.*;
 
 public class OPDSCatalogItem extends NetworkURLCatalogItem {
 	static class State extends NetworkOperationData {
diff --git a/src/org/geometerplus/fbreader/network/opds/OPDSCustomLink.java b/src/org/geometerplus/fbreader/network/opds/OPDSCustomLink.java
index aec0ff877..c711ec72e 100644
--- a/src/org/geometerplus/fbreader/network/opds/OPDSCustomLink.java
+++ b/src/org/geometerplus/fbreader/network/opds/OPDSCustomLink.java
@@ -31,7 +31,7 @@ import org.geometerplus.zlibrary.core.util.ZLMiscUtil;
 
 import org.geometerplus.fbreader.network.ICustomNetworkLink;
 import org.geometerplus.fbreader.network.NetworkException;
-import org.geometerplus.fbreader.network.UrlInfoWithDate;
+import org.geometerplus.fbreader.network.urlInfo.UrlInfoWithDate;
 
 public class OPDSCustomLink extends OPDSNetworkLink implements ICustomNetworkLink {
 	private int myId;
diff --git a/src/org/geometerplus/fbreader/network/opds/OPDSLinkXMLReader.java b/src/org/geometerplus/fbreader/network/opds/OPDSLinkXMLReader.java
index 4ff64718c..4d787e44a 100644
--- a/src/org/geometerplus/fbreader/network/opds/OPDSLinkXMLReader.java
+++ b/src/org/geometerplus/fbreader/network/opds/OPDSLinkXMLReader.java
@@ -27,14 +27,12 @@ import org.geometerplus.zlibrary.core.filesystem.ZLResourceFile;
 import org.geometerplus.zlibrary.core.util.ZLNetworkUtil;
 import org.geometerplus.zlibrary.core.xml.ZLStringMap;
 
-import org.geometerplus.fbreader.network.INetworkLink;
-import org.geometerplus.fbreader.network.NetworkLibrary;
-import org.geometerplus.fbreader.network.NetworkCatalogItem;
-import org.geometerplus.fbreader.network.UrlInfoWithDate;
+import org.geometerplus.fbreader.network.*;
 import org.geometerplus.fbreader.network.atom.ATOMLink;
 import org.geometerplus.fbreader.network.atom.ATOMUpdated;
 import org.geometerplus.fbreader.network.authentication.NetworkAuthenticationManager;
 import org.geometerplus.fbreader.network.authentication.litres.LitResAuthenticationManager;
+import org.geometerplus.fbreader.network.urlInfo.UrlInfoWithDate;
 
 class OPDSLinkXMLReader extends OPDSXMLReader implements OPDSConstants, MimeTypes {
 	private static class LinkReader implements OPDSFeedReader {
diff --git a/src/org/geometerplus/fbreader/network/opds/OPDSNetworkLink.java b/src/org/geometerplus/fbreader/network/opds/OPDSNetworkLink.java
index 9f359faad..e7e2521ad 100644
--- a/src/org/geometerplus/fbreader/network/opds/OPDSNetworkLink.java
+++ b/src/org/geometerplus/fbreader/network/opds/OPDSNetworkLink.java
@@ -32,9 +32,10 @@ import org.geometerplus.zlibrary.core.network.ZLNetworkRequest;
 
 import org.geometerplus.fbreader.network.*;
 import org.geometerplus.fbreader.network.authentication.NetworkAuthenticationManager;
+import org.geometerplus.fbreader.network.urlInfo.*;
 
 public class OPDSNetworkLink extends AbstractNetworkLink {
-	private TreeMap<RelationAlias, String> myRelationAliases;
+	private TreeMap<RelationAlias,String> myRelationAliases;
 
 	private TreeMap<String,NetworkCatalogItem.Accessibility> myUrlConditions;
 	private final LinkedList<URLRewritingRule> myUrlRewritingRules = new LinkedList<URLRewritingRule>();
diff --git a/src/org/geometerplus/fbreader/network/BookBuyUrlInfo.java b/src/org/geometerplus/fbreader/network/urlInfo/BookBuyUrlInfo.java
similarity index 96%
rename from src/org/geometerplus/fbreader/network/BookBuyUrlInfo.java
rename to src/org/geometerplus/fbreader/network/urlInfo/BookBuyUrlInfo.java
index 112d15ed6..c3cbb3ffc 100644
--- a/src/org/geometerplus/fbreader/network/BookBuyUrlInfo.java
+++ b/src/org/geometerplus/fbreader/network/urlInfo/BookBuyUrlInfo.java
@@ -17,7 +17,7 @@
  * 02110-1301, USA.
  */
 
-package org.geometerplus.fbreader.network;
+package org.geometerplus.fbreader.network.urlInfo;
 
 public class BookBuyUrlInfo extends BookUrlInfo {
 	public final String Price;
diff --git a/src/org/geometerplus/fbreader/network/BookUrlInfo.java b/src/org/geometerplus/fbreader/network/urlInfo/BookUrlInfo.java
similarity index 98%
rename from src/org/geometerplus/fbreader/network/BookUrlInfo.java
rename to src/org/geometerplus/fbreader/network/urlInfo/BookUrlInfo.java
index cfdbe87d2..3a54068ea 100644
--- a/src/org/geometerplus/fbreader/network/BookUrlInfo.java
+++ b/src/org/geometerplus/fbreader/network/urlInfo/BookUrlInfo.java
@@ -17,7 +17,7 @@
  * 02110-1301, USA.
  */
 
-package org.geometerplus.fbreader.network;
+package org.geometerplus.fbreader.network.urlInfo;
 
 import java.io.File;
 import java.net.URI;
diff --git a/src/org/geometerplus/fbreader/network/DecoratedBookUrlInfo.java b/src/org/geometerplus/fbreader/network/urlInfo/DecoratedBookUrlInfo.java
similarity index 95%
rename from src/org/geometerplus/fbreader/network/DecoratedBookUrlInfo.java
rename to src/org/geometerplus/fbreader/network/urlInfo/DecoratedBookUrlInfo.java
index 538fe819f..2e853d8d5 100644
--- a/src/org/geometerplus/fbreader/network/DecoratedBookUrlInfo.java
+++ b/src/org/geometerplus/fbreader/network/urlInfo/DecoratedBookUrlInfo.java
@@ -17,7 +17,7 @@
  * 02110-1301, USA.
  */
 
-package org.geometerplus.fbreader.network;
+package org.geometerplus.fbreader.network.urlInfo;
 
 public class DecoratedBookUrlInfo extends BookUrlInfo {
 	private final String myCleanUrl;
diff --git a/src/org/geometerplus/fbreader/network/UrlInfo.java b/src/org/geometerplus/fbreader/network/urlInfo/UrlInfo.java
similarity index 96%
rename from src/org/geometerplus/fbreader/network/UrlInfo.java
rename to src/org/geometerplus/fbreader/network/urlInfo/UrlInfo.java
index 04d970db7..a252873e8 100644
--- a/src/org/geometerplus/fbreader/network/UrlInfo.java
+++ b/src/org/geometerplus/fbreader/network/urlInfo/UrlInfo.java
@@ -17,7 +17,7 @@
  * 02110-1301, USA.
  */
 
-package org.geometerplus.fbreader.network;
+package org.geometerplus.fbreader.network.urlInfo;
 
 import java.io.Serializable;
 
diff --git a/src/org/geometerplus/fbreader/network/UrlInfoCollection.java b/src/org/geometerplus/fbreader/network/urlInfo/UrlInfoCollection.java
similarity index 97%
rename from src/org/geometerplus/fbreader/network/UrlInfoCollection.java
rename to src/org/geometerplus/fbreader/network/urlInfo/UrlInfoCollection.java
index 6761526b1..16e8d682b 100644
--- a/src/org/geometerplus/fbreader/network/UrlInfoCollection.java
+++ b/src/org/geometerplus/fbreader/network/urlInfo/UrlInfoCollection.java
@@ -17,7 +17,7 @@
  * 02110-1301, USA.
  */
 
-package org.geometerplus.fbreader.network;
+package org.geometerplus.fbreader.network.urlInfo;
 
 import java.util.*;
 
diff --git a/src/org/geometerplus/fbreader/network/UrlInfoWithDate.java b/src/org/geometerplus/fbreader/network/urlInfo/UrlInfoWithDate.java
similarity index 97%
rename from src/org/geometerplus/fbreader/network/UrlInfoWithDate.java
rename to src/org/geometerplus/fbreader/network/urlInfo/UrlInfoWithDate.java
index 608544c9d..b022f52b6 100644
--- a/src/org/geometerplus/fbreader/network/UrlInfoWithDate.java
+++ b/src/org/geometerplus/fbreader/network/urlInfo/UrlInfoWithDate.java
@@ -17,7 +17,7 @@
  * 02110-1301, USA.
  */
 
-package org.geometerplus.fbreader.network;
+package org.geometerplus.fbreader.network.urlInfo;
 
 import java.util.Date;
 import java.io.Serializable;