diff --git a/test/zlibrary/model/TestAll.java b/test/org/test/zlibrary/model/test/TestAll.java
similarity index 89%
rename from test/zlibrary/model/TestAll.java
rename to test/org/test/zlibrary/model/test/TestAll.java
index fccbb62e8..a804a7e89 100644
--- a/test/zlibrary/model/TestAll.java
+++ b/test/org/test/zlibrary/model/test/TestAll.java
@@ -1,4 +1,4 @@
-package org.test.zlibrary.model;
+package org.test.zlibrary.model.test;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
diff --git a/test/zlibrary/model/test/TestTextControlEntry.java b/test/org/test/zlibrary/model/test/TestTextControlEntry.java
similarity index 90%
rename from test/zlibrary/model/test/TestTextControlEntry.java
rename to test/org/test/zlibrary/model/test/TestTextControlEntry.java
index d6e79db45..09414b152 100644
--- a/test/zlibrary/model/test/TestTextControlEntry.java
+++ b/test/org/test/zlibrary/model/test/TestTextControlEntry.java
@@ -1,4 +1,4 @@
-package org.test.zlibrary.model;
+package org.test.zlibrary.model.test;
 
 import org.zlibrary.model.entry.ZLTextControlEntry;
 import org.zlibrary.model.impl.ZLModelFactory;
diff --git a/test/zlibrary/model/test/TestTextControlEntryPool.java b/test/org/test/zlibrary/model/test/TestTextControlEntryPool.java
similarity index 91%
rename from test/zlibrary/model/test/TestTextControlEntryPool.java
rename to test/org/test/zlibrary/model/test/TestTextControlEntryPool.java
index fef541624..bed96be5a 100644
--- a/test/zlibrary/model/test/TestTextControlEntryPool.java
+++ b/test/org/test/zlibrary/model/test/TestTextControlEntryPool.java
@@ -1,4 +1,4 @@
-package org.test.zlibrary.model;
+package org.test.zlibrary.model.test;
 
 import junit.framework.TestCase;
 import org.zlibrary.model.entry.ZLTextControlEntryPool;
diff --git a/test/zlibrary/model/test/TestTextEntry.java b/test/org/test/zlibrary/model/test/TestTextEntry.java
similarity index 89%
rename from test/zlibrary/model/test/TestTextEntry.java
rename to test/org/test/zlibrary/model/test/TestTextEntry.java
index 8c5fcd511..b30790fa2 100644
--- a/test/zlibrary/model/test/TestTextEntry.java
+++ b/test/org/test/zlibrary/model/test/TestTextEntry.java
@@ -1,4 +1,4 @@
-package org.test.zlibrary.model;
+package org.test.zlibrary.model.test;
 
 import junit.framework.TestCase;
 import org.zlibrary.model.entry.ZLTextEntry;
diff --git a/test/zlibrary/model/test/TestTextParagraph.java b/test/org/test/zlibrary/model/test/TestTextParagraph.java
similarity index 91%
rename from test/zlibrary/model/test/TestTextParagraph.java
rename to test/org/test/zlibrary/model/test/TestTextParagraph.java
index 526797de2..9caac71f4 100644
--- a/test/zlibrary/model/test/TestTextParagraph.java
+++ b/test/org/test/zlibrary/model/test/TestTextParagraph.java
@@ -1,4 +1,4 @@
-package org.test.zlibrary.model;
+package org.test.zlibrary.model.test;
 
 import org.zlibrary.model.ZLTextParagraph;
 import org.zlibrary.model.impl.ZLModelFactory;
diff --git a/test/zlibrary/model/test/TestZLTextModel.java b/test/org/test/zlibrary/model/test/TestZLTextModel.java
similarity index 95%
rename from test/zlibrary/model/test/TestZLTextModel.java
rename to test/org/test/zlibrary/model/test/TestZLTextModel.java
index da1d8905e..e7de0472f 100644
--- a/test/zlibrary/model/test/TestZLTextModel.java
+++ b/test/org/test/zlibrary/model/test/TestZLTextModel.java
@@ -1,4 +1,4 @@
-package org.test.zlibrary.model;
+package org.test.zlibrary.model.test;
 
 import junit.framework.TestCase;
 import org.zlibrary.model.ZLTextModel;
diff --git a/test/zlibrary/model/TestTextControlEntry.java b/test/zlibrary/model/TestTextControlEntry.java
deleted file mode 100644
index 78cf1ca8a..000000000
--- a/test/zlibrary/model/TestTextControlEntry.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package org.test.zlibrary.model;
-
-import org.zlibrary.model.entry.ZLTextControlEntry;
-import org.zlibrary.model.impl.entry.ZLTextControlEntryImpl;
-import junit.framework.TestCase;
-
-public class TestTextControlEntry extends TestCase {
-    public void test() {
-        boolean start = true;
-        byte kind = (byte)0;
-        ZLTextControlEntry entry = new ZLTextControlEntryImpl(kind, start);
-        assertEquals(entry.getKind(), kind);
-        assertEquals(entry.isStart(), start);
-    }
-}
diff --git a/test/zlibrary/model/TestTextControlEntryPool.java b/test/zlibrary/model/TestTextControlEntryPool.java
deleted file mode 100644
index cc9103ba7..000000000
--- a/test/zlibrary/model/TestTextControlEntryPool.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.test.zlibrary.model;
-
-import junit.framework.TestCase;
-import org.zlibrary.model.entry.ZLTextControlEntryPool;
-import org.zlibrary.model.entry.ZLTextControlEntry;
-import org.zlibrary.model.entry.ZLTextParagraphEntry;
-import org.zlibrary.model.impl.entry.ZLTextControlEntryPoolImpl;
-
-public class TestTextControlEntryPool extends TestCase {
-    public void test() {
-        ZLTextControlEntryPool zpool = new ZLTextControlEntryPoolImpl();
-        byte kind = 0;
-        boolean start = true;
-        ZLTextParagraphEntry entry = zpool.getControlEntry(kind, start);
-        assertEquals(entry, zpool.getControlEntry(kind, start));
-    }
-}
diff --git a/test/zlibrary/model/TestTextEntry.java b/test/zlibrary/model/TestTextEntry.java
deleted file mode 100644
index 5af9519ee..000000000
--- a/test/zlibrary/model/TestTextEntry.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package org.test.zlibrary.model;
-
-import junit.framework.TestCase;
-import org.zlibrary.model.entry.ZLTextEntry;
-import org.zlibrary.model.impl.entry.ZLTextEntryImpl;
-
-public class TestTextEntry extends TestCase {
-
-    public void test() {
-        String str = "marina";
-        ZLTextEntry entry = new ZLTextEntryImpl(str);
-        assertEquals(entry.getData(), str);
-        assertEquals(entry.getDataLength(), str.length());
-    }
-}
diff --git a/test/zlibrary/model/TestTextParagraph.java b/test/zlibrary/model/TestTextParagraph.java
deleted file mode 100644
index 3c35d4090..000000000
--- a/test/zlibrary/model/TestTextParagraph.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.test.zlibrary.model;
-
-import org.zlibrary.model.ZLTextParagraph;
-import org.zlibrary.model.impl.ZLTextParagraphImpl;
-import org.zlibrary.model.impl.entry.ZLTextEntryImpl;
-import junit.framework.TestCase;
-
-public class TestTextParagraph extends TestCase {
-    public void test() {
-        ZLTextParagraph paragraph = new ZLTextParagraphImpl();
-        paragraph.addEntry(new ZLTextEntryImpl("marina1"));
-        paragraph.addEntry(new ZLTextEntryImpl("marina2"));
-        assertEquals(paragraph.getEntryNumber(), 2);
-        assertEquals(paragraph.getTextLength(),14);
-    }
-}
diff --git a/test/zlibrary/model/TestZLTextModel.java b/test/zlibrary/model/TestZLTextModel.java
deleted file mode 100644
index f32fd2d33..000000000
--- a/test/zlibrary/model/TestZLTextModel.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package org.test.zlibrary.model;
-
-import junit.framework.TestCase;
-import org.zlibrary.model.ZLTextModel;
-import org.zlibrary.model.ZLTextParagraph;
-import org.zlibrary.model.entry.ZLTextEntry;
-import org.zlibrary.model.impl.ZLTextModelImpl;
-import org.zlibrary.model.impl.ZLTextParagraphImpl;
-import org.zlibrary.model.impl.entry.ZLTextEntryImpl;
-import org.zlibrary.model.impl.entry.ZLTextControlEntryImpl;
-
-import java.util.List;
-import java.util.LinkedList;
-
-public class TestZLTextModel extends TestCase {
-     
-    public void testAddParagraph() {
-        ZLTextModel model = new ZLTextModelImpl();
-        ZLTextParagraph paragraph = new ZLTextParagraphImpl();
-        paragraph.addEntry(new ZLTextEntryImpl("marina"));
-        model.addParagraphInternal(paragraph);
-        model.addParagraphInternal(new ZLTextParagraphImpl());
-        assertEquals(model.getParagraphsNumber(), 2);
-        assertEquals(model.getParagraph(0), paragraph);
-    }
-
-    public void testAddEntry() {
-        ZLTextModel model = new ZLTextModelImpl();
-        ZLTextParagraph paragraph = new ZLTextParagraphImpl();
-        paragraph.addEntry(new ZLTextEntryImpl("marina"));
-        model.addParagraphInternal(paragraph);
-        model.addParagraphInternal(new ZLTextParagraphImpl());
-        assertEquals(model.getParagraphsNumber(), 2);
-        assertEquals(model.getParagraph(0), paragraph);
-        model.addText("addText");
-        assertEquals(((ZLTextEntry)model.getParagraph(1).getEntries().get(0)).getData(), "addText");
-        List<String> list = new LinkedList<String>();
-        list.add("1");
-        list.add("2");
-        model.addText(list);
-        assertEquals(((ZLTextEntry)model.getParagraph(1).getEntries().get(1)).getData(), "12");
-    }
-
-    public void testAddControl() {
-        ZLTextModel model = new ZLTextModelImpl();
-        ZLTextParagraph paragraph = new ZLTextParagraphImpl();
-        paragraph.addEntry(new ZLTextEntryImpl("marina"));
-        model.addParagraphInternal(paragraph);
-        model.addParagraphInternal(new ZLTextParagraphImpl());
-        assertEquals(model.getParagraphsNumber(), 2);
-        assertEquals(model.getParagraph(0), paragraph);
-        model.addControl((byte)0, true);
-        model.addControl((byte)0, false);
-        model.addControl((byte)1, true);
-        model.addControl((byte)1, false);
-        model.addControl((byte)0, true);
-        model.addControl((byte)0, false);
-        
-    }
-
-}
diff --git a/test/zlibrary/model/test/TestAll.java b/test/zlibrary/model/test/TestAll.java
deleted file mode 100644
index fccbb62e8..000000000
--- a/test/zlibrary/model/test/TestAll.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.test.zlibrary.model;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-public class TestAll {
-    public static Test suite() {
-        TestSuite suite = new TestSuite();
-        suite.addTestSuite(TestTextControlEntry.class);
-        suite.addTestSuite(TestTextControlEntryPool.class);
-        suite.addTestSuite(TestTextEntry.class);
-        suite.addTestSuite(TestTextParagraph.class);
-        suite.addTestSuite(TestZLTextModel.class);       
-        return suite;
-    }
-}