diff --git a/src/org/fbreader/fbreader/FBReader.java b/src/org/fbreader/fbreader/FBReader.java
new file mode 100644
index 000000000..01542f240
--- /dev/null
+++ b/src/org/fbreader/fbreader/FBReader.java
@@ -0,0 +1,18 @@
+package org.fbreader.fbreader;
+
+import org.zlibrary.core.application.ZLApplication;
+import org.zlibrary.core.application.ZLKeyBindings;
+import org.zlibrary.text.view.ZLTextView;
+
+public class FBReader extends ZLApplication {
+	public FBReader(String fileName) {
+		super("Sample");
+		ZLTextView view = new ZLTextView(this, getContext());
+		view.setModel(fileName);
+		setView(view);
+	}
+
+	public ZLKeyBindings keyBindings() {
+		return null;
+	}
+}
diff --git a/src/org/zlibrary/sampleview/Main.java b/src/org/fbreader/fbreader/Main.java
similarity index 65%
rename from src/org/zlibrary/sampleview/Main.java
rename to src/org/fbreader/fbreader/Main.java
index 347555059..cdade61de 100644
--- a/src/org/zlibrary/sampleview/Main.java
+++ b/src/org/fbreader/fbreader/Main.java
@@ -1,11 +1,11 @@
-package org.zlibrary.sampleview;
+package org.fbreader.fbreader;
 
 import org.zlibrary.core.library.ZLibrary;
 
 public class Main {
 	public static void main(String[] args) {
 		ZLibrary.init();
-		ZLibrary.run(new SampleApplication(args[0]));
+		ZLibrary.run(new FBReader(args[0]));
 		ZLibrary.shutdown();
 	}
 }
diff --git a/src/org/zlibrary/sampleview/SampleApplication.java b/src/org/zlibrary/sampleview/SampleApplication.java
deleted file mode 100644
index e05e85878..000000000
--- a/src/org/zlibrary/sampleview/SampleApplication.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.zlibrary.sampleview;
-
-import org.zlibrary.core.application.*;
-
-
-public class SampleApplication extends ZLApplication {
-	public SampleApplication(String fileName) {
-		super("Sample");
-		SampleView view = new SampleView(this, getContext());
-		view.setModel(fileName);
-		setView(view);
-	}
-
-	public ZLKeyBindings keyBindings() {
-		return null;
-	}
-}
diff --git a/src/org/zlibrary/sampleview/SampleView.java b/src/org/zlibrary/sampleview/SampleView.java
deleted file mode 100644
index 36d55b248..000000000
--- a/src/org/zlibrary/sampleview/SampleView.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package org.zlibrary.sampleview;
-
-import org.zlibrary.core.view.ZLView;
-import org.zlibrary.core.view.ZLPaintContext;
-
-import org.zlibrary.text.model.*;
-import org.zlibrary.text.model.impl.ZLModelFactory;
-import org.zlibrary.text.model.entry.*;
-
-import org.zlibrary.text.view.impl.*;
-
-import org.fbreader.bookmodel.*;
-import org.fbreader.formats.fb2.*;
-
-class SampleView extends ZLView {
-	private BookModel myModel;
-
-	void setModel(String fileName) {
-		myModel = new FB2Reader(fileName).read();
-	}
-
-	SampleView(SampleApplication application, ZLPaintContext context) {
-		super(application, context);
-
-		/*
-		ZLModelFactory modelFactory = new ZLModelFactory();
-		myModel = modelFactory.createPlainModel();
-		ZLTextParagraph paragraph = modelFactory.createParagraph();
-		ZLTextEntry entry;
-		entry = modelFactory.createTextEntry("First paragraph:  Some text here ");
-		paragraph.addEntry(entry);
-		myModel.addParagraphInternal(paragraph);
-
-		paragraph = modelFactory.createParagraph();
-		entry = modelFactory.createTextEntry("  Second paragraph: ");
-		paragraph.addEntry(entry);
-		myModel.addParagraphInternal(paragraph);
-		*/
-	}
-
-	public void paint() {
-		ZLPaintContext context = getContext();
-
-		ZLTextModel model = myModel.getBookModel();
-		int paragraphs = model.getParagraphsNumber();
-		int h = 0;
-		int dh = context.stringHeight();
-		for (int i = 0; i < paragraphs; i++) {
-			ZLTextParagraphCursor cursor = ZLTextParagraphCursor.getCursor(model, i);
-			for (int j = 0; j < cursor.getParagraphLength(); j++) {
-				ZLTextElement element = cursor.getElement(j);
-				if (element instanceof ZLTextWord) {
-					String text = ((ZLTextWord) element).myData;
-					final int w = context.stringWidth(text);
-					h += dh;
-					context.drawString((context.getWidth() - w) / 2, h, text);
-				}	
-			}
-			h += dh;	
-		}
-
-/*		String text = "42";
-		final int w = context.stringWidth(text);
-		context.drawString((context.getWidth() - w) / 2, context.stringHeight(), text);
-*/	
-	}
-
-	public String caption() {
-		return "SampleView";
-	}
-}
diff --git a/src/org/zlibrary/text/view/ZLTextView.java b/src/org/zlibrary/text/view/ZLTextView.java
index bd2e24772..741df50b6 100644
--- a/src/org/zlibrary/text/view/ZLTextView.java
+++ b/src/org/zlibrary/text/view/ZLTextView.java
@@ -1,5 +1,57 @@
 package org.zlibrary.text.view;
 
-public interface ZLTextView {
+import org.zlibrary.core.application.ZLApplication;
+import org.zlibrary.core.view.ZLView;
+import org.zlibrary.core.view.ZLPaintContext;
 
+import org.zlibrary.text.model.*;
+import org.zlibrary.text.model.impl.ZLModelFactory;
+import org.zlibrary.text.model.entry.*;
+
+import org.zlibrary.text.view.impl.*;
+
+import org.fbreader.bookmodel.*;
+import org.fbreader.formats.fb2.*;
+
+public class ZLTextView extends ZLView {
+	private BookModel myModel;
+
+	public ZLTextView(ZLApplication application, ZLPaintContext context) {
+		super(application, context);
+	}
+
+	public void setModel(String fileName) {
+		myModel = new FB2Reader(fileName).read();
+	}
+
+	public void paint() {
+		ZLPaintContext context = getContext();
+
+		ZLTextModel model = myModel.getBookModel();
+		int paragraphs = model.getParagraphsNumber();
+		int h = 0;
+		int dh = context.stringHeight();
+		for (int i = 0; i < paragraphs; i++) {
+			ZLTextParagraphCursor cursor = ZLTextParagraphCursor.getCursor(model, i);
+			for (int j = 0; j < cursor.getParagraphLength(); j++) {
+				ZLTextElement element = cursor.getElement(j);
+				if (element instanceof ZLTextWord) {
+					String text = ((ZLTextWord) element).myData;
+					final int w = context.stringWidth(text);
+					h += dh;
+					context.drawString((context.getWidth() - w) / 2, h, text);
+				}	
+			}
+			h += dh;	
+		}
+
+/*		String text = "42";
+		final int w = context.stringWidth(text);
+		context.drawString((context.getWidth() - w) / 2, context.stringHeight(), text);
+*/	
+	}
+
+	public String caption() {
+		return "SampleView";
+	}
 }
diff --git a/src/org/zlibrary/text/view/impl/ZLTextViewImpl.java b/src/org/zlibrary/text/view/impl/ZLTextViewImpl.java
index 6a84f8744..9b2be2f6a 100644
--- a/src/org/zlibrary/text/view/impl/ZLTextViewImpl.java
+++ b/src/org/zlibrary/text/view/impl/ZLTextViewImpl.java
@@ -3,7 +3,7 @@ package org.zlibrary.text.view.impl;
 import org.zlibrary.text.model.*;
 import org.zlibrary.text.view.ZLTextView;
 
-class ZLTextViewImpl implements ZLTextView {
+class ZLTextViewImpl { //implements ZLTextView {
 
 	private ZLTextModel myModel;