diff --git a/fine-itext/src/com/third/v2/lowagie/text/Anchor.java b/fine-itext/src/com/fr/third/v2/lowagie/text/Anchor.java similarity index 99% rename from fine-itext/src/com/third/v2/lowagie/text/Anchor.java rename to fine-itext/src/com/fr/third/v2/lowagie/text/Anchor.java index 5a6d75240..7a255b2f2 100644 --- a/fine-itext/src/com/third/v2/lowagie/text/Anchor.java +++ b/fine-itext/src/com/fr/third/v2/lowagie/text/Anchor.java @@ -47,7 +47,7 @@ * http://www.lowagie.com/iText/ */ -package com.third.v2.lowagie.text; +package com.fr.third.v2.lowagie.text; import java.net.MalformedURLException; import java.net.URL; @@ -246,7 +246,7 @@ public class Anchor extends Phrase { * @return a type */ public int type() { - return Element.ANCHOR; + return ANCHOR; } // methods diff --git a/fine-itext/src/com/third/v2/lowagie/text/Annotation.java b/fine-itext/src/com/fr/third/v2/lowagie/text/Annotation.java similarity index 99% rename from fine-itext/src/com/third/v2/lowagie/text/Annotation.java rename to fine-itext/src/com/fr/third/v2/lowagie/text/Annotation.java index 9b79a5702..bea150dde 100644 --- a/fine-itext/src/com/third/v2/lowagie/text/Annotation.java +++ b/fine-itext/src/com/fr/third/v2/lowagie/text/Annotation.java @@ -47,7 +47,7 @@ * http://www.lowagie.com/iText/ */ -package com.third.v2.lowagie.text; +package com.fr.third.v2.lowagie.text; import java.net.URL; import java.util.ArrayList; diff --git a/fine-itext/src/com/third/v2/lowagie/text/BadElementException.java b/fine-itext/src/com/fr/third/v2/lowagie/text/BadElementException.java similarity index 98% rename from fine-itext/src/com/third/v2/lowagie/text/BadElementException.java rename to fine-itext/src/com/fr/third/v2/lowagie/text/BadElementException.java index 2b5af91e0..2bb1ad2e0 100644 --- a/fine-itext/src/com/third/v2/lowagie/text/BadElementException.java +++ b/fine-itext/src/com/fr/third/v2/lowagie/text/BadElementException.java @@ -47,7 +47,7 @@ * http://www.lowagie.com/iText/ */ -package com.third.v2.lowagie.text; +package com.fr.third.v2.lowagie.text; /** * Signals an attempt to create an Element that hasn't got the right form. diff --git a/fine-itext/src/com/third/v2/lowagie/text/Cell.java b/fine-itext/src/com/fr/third/v2/lowagie/text/Cell.java similarity index 96% rename from fine-itext/src/com/third/v2/lowagie/text/Cell.java rename to fine-itext/src/com/fr/third/v2/lowagie/text/Cell.java index 91a6c5206..bc0145204 100644 --- a/fine-itext/src/com/third/v2/lowagie/text/Cell.java +++ b/fine-itext/src/com/fr/third/v2/lowagie/text/Cell.java @@ -47,12 +47,12 @@ * http://www.lowagie.com/iText/ */ -package com.third.v2.lowagie.text; +package com.fr.third.v2.lowagie.text; import java.util.ArrayList; import java.util.Iterator; -import com.third.v2.lowagie.text.pdf.PdfPCell; +import com.fr.third.v2.lowagie.text.pdf.PdfPCell; /** * A Cell is a Rectangle containing other @@ -100,10 +100,10 @@ public class Cell extends Rectangle implements TextElementArray { protected ArrayList arrayList = null; /** The horizontal alignment of the cell content. */ - protected int horizontalAlignment = Element.ALIGN_UNDEFINED; + protected int horizontalAlignment = ALIGN_UNDEFINED; /** The vertical alignment of the cell content. */ - protected int verticalAlignment = Element.ALIGN_UNDEFINED; + protected int verticalAlignment = ALIGN_UNDEFINED; /** * The width of the cell as a String. @@ -239,7 +239,7 @@ public class Cell extends Rectangle implements TextElementArray { * @return a type */ public int type() { - return Element.CELL; + return CELL; } /** @@ -560,13 +560,13 @@ public class Cell extends Rectangle implements TextElementArray { case 1: Element element = (Element) arrayList.get(0); switch (element.type()) { - case Element.CHUNK: + case CHUNK: return ((Chunk) element).isEmpty(); - case Element.ANCHOR: - case Element.PHRASE: - case Element.PARAGRAPH: + case ANCHOR: + case PHRASE: + case PARAGRAPH: return ((Phrase) element).isEmpty(); - case Element.LIST: + case LIST: return ((List) element).isEmpty(); } return false; @@ -591,7 +591,7 @@ public class Cell extends Rectangle implements TextElementArray { */ public boolean isTable() { return (size() == 1) - && (((Element)arrayList.get(0)).type() == Element.TABLE); + && (((Element)arrayList.get(0)).type() == TABLE); } /** @@ -613,11 +613,11 @@ public class Cell extends Rectangle implements TextElementArray { return; } switch(element.type()) { - case Element.LISTITEM: - case Element.ROW: - case Element.CELL: + case LISTITEM: + case ROW: + case CELL: throw new BadElementException("You can't add listitems, rows or cells to a cell."); - case Element.LIST: + case LIST: List list = (List)element; if (Float.isNaN(leading)) { setLeading(list.getTotalLeading()); @@ -625,9 +625,9 @@ public class Cell extends Rectangle implements TextElementArray { if (list.isEmpty()) return; arrayList.add(element); return; - case Element.ANCHOR: - case Element.PARAGRAPH: - case Element.PHRASE: + case ANCHOR: + case PARAGRAPH: + case PHRASE: Phrase p = (Phrase)element; if (Float.isNaN(leading)) { setLeading(p.getLeading()); @@ -635,24 +635,24 @@ public class Cell extends Rectangle implements TextElementArray { if (p.isEmpty()) return; arrayList.add(element); return; - case Element.CHUNK: + case CHUNK: if (((Chunk) element).isEmpty()) return; arrayList.add(element); return; - case Element.TABLE: + case TABLE: Table table = new Table(3); float[] widths = new float[3]; widths[1] = ((Table)element).getWidth(); switch(((Table)element).getAlignment()) { - case Element.ALIGN_LEFT: + case ALIGN_LEFT: widths[0] = 0f; widths[2] = 100f - widths[1]; break; - case Element.ALIGN_CENTER: + case ALIGN_CENTER: widths[0] = (100f - widths[1]) / 2f; widths[2] = widths[0]; break; - case Element.ALIGN_RIGHT: + case ALIGN_RIGHT: widths[0] = 100f - widths[1]; widths[2] = 0f; } @@ -737,7 +737,7 @@ public class Cell extends Rectangle implements TextElementArray { cell.setNoWrap(getMaxLines() == 1); for (Iterator i = getElements(); i.hasNext(); ) { Element e = (Element)i.next(); - if (e.type() == Element.PHRASE || e.type() == Element.PARAGRAPH) { + if (e.type() == PHRASE || e.type() == PARAGRAPH) { Paragraph p = new Paragraph((Phrase)e); p.setAlignment(horizontalAlignment); e = p; diff --git a/fine-itext/src/com/third/v2/lowagie/text/Chapter.java b/fine-itext/src/com/fr/third/v2/lowagie/text/Chapter.java similarity index 99% rename from fine-itext/src/com/third/v2/lowagie/text/Chapter.java rename to fine-itext/src/com/fr/third/v2/lowagie/text/Chapter.java index c6dd572d7..0c85b9be3 100644 --- a/fine-itext/src/com/third/v2/lowagie/text/Chapter.java +++ b/fine-itext/src/com/fr/third/v2/lowagie/text/Chapter.java @@ -48,7 +48,7 @@ * */ -package com.third.v2.lowagie.text; +package com.fr.third.v2.lowagie.text; import java.util.ArrayList; diff --git a/fine-itext/src/com/third/v2/lowagie/text/ChapterAutoNumber.java b/fine-itext/src/com/fr/third/v2/lowagie/text/ChapterAutoNumber.java similarity index 99% rename from fine-itext/src/com/third/v2/lowagie/text/ChapterAutoNumber.java rename to fine-itext/src/com/fr/third/v2/lowagie/text/ChapterAutoNumber.java index 644c131d3..3627dc1e6 100644 --- a/fine-itext/src/com/third/v2/lowagie/text/ChapterAutoNumber.java +++ b/fine-itext/src/com/fr/third/v2/lowagie/text/ChapterAutoNumber.java @@ -45,7 +45,7 @@ * http://www.lowagie.com/iText/ */ -package com.third.v2.lowagie.text; +package com.fr.third.v2.lowagie.text; /** * Chapter with auto numbering. diff --git a/fine-itext/src/com/third/v2/lowagie/text/Chunk.java b/fine-itext/src/com/fr/third/v2/lowagie/text/Chunk.java similarity index 98% rename from fine-itext/src/com/third/v2/lowagie/text/Chunk.java rename to fine-itext/src/com/fr/third/v2/lowagie/text/Chunk.java index 7901ea420..bf852af9d 100644 --- a/fine-itext/src/com/third/v2/lowagie/text/Chunk.java +++ b/fine-itext/src/com/fr/third/v2/lowagie/text/Chunk.java @@ -47,18 +47,18 @@ * http://www.lowagie.com/iText/ */ -package com.third.v2.lowagie.text; +package com.fr.third.v2.lowagie.text; import java.awt.Color; import java.net.URL; import java.util.ArrayList; import java.util.HashMap; -import com.third.v2.lowagie.text.pdf.HyphenationEvent; -import com.third.v2.lowagie.text.pdf.PdfAction; -import com.third.v2.lowagie.text.pdf.PdfAnnotation; -import com.third.v2.lowagie.text.pdf.PdfContentByte; -import com.third.v2.lowagie.text.pdf.draw.DrawInterface; +import com.fr.third.v2.lowagie.text.pdf.PdfAction; +import com.fr.third.v2.lowagie.text.pdf.PdfContentByte; +import com.fr.third.v2.lowagie.text.pdf.HyphenationEvent; +import com.fr.third.v2.lowagie.text.pdf.PdfAnnotation; +import com.fr.third.v2.lowagie.text.pdf.draw.DrawInterface; /** * This is the smallest significant part of text that can be added to a @@ -307,7 +307,7 @@ public class Chunk implements Element { * @return a type */ public int type() { - return CHUNK; + return Element.CHUNK; } /** diff --git a/fine-itext/src/com/third/v2/lowagie/text/DocListener.java b/fine-itext/src/com/fr/third/v2/lowagie/text/DocListener.java similarity index 99% rename from fine-itext/src/com/third/v2/lowagie/text/DocListener.java rename to fine-itext/src/com/fr/third/v2/lowagie/text/DocListener.java index 64434a1f6..fb862611c 100644 --- a/fine-itext/src/com/third/v2/lowagie/text/DocListener.java +++ b/fine-itext/src/com/fr/third/v2/lowagie/text/DocListener.java @@ -47,7 +47,7 @@ * http://www.lowagie.com/iText/ */ -package com.third.v2.lowagie.text; +package com.fr.third.v2.lowagie.text; /** * A class that implements DocListener will perform some diff --git a/fine-itext/src/com/third/v2/lowagie/text/DocWriter.java b/fine-itext/src/com/fr/third/v2/lowagie/text/DocWriter.java similarity index 99% rename from fine-itext/src/com/third/v2/lowagie/text/DocWriter.java rename to fine-itext/src/com/fr/third/v2/lowagie/text/DocWriter.java index 18a1f9f60..f927270ee 100644 --- a/fine-itext/src/com/third/v2/lowagie/text/DocWriter.java +++ b/fine-itext/src/com/fr/third/v2/lowagie/text/DocWriter.java @@ -47,7 +47,7 @@ * http://www.lowagie.com/iText/ */ -package com.third.v2.lowagie.text; +package com.fr.third.v2.lowagie.text; import java.io.BufferedOutputStream; import java.io.IOException; @@ -55,7 +55,7 @@ import java.io.OutputStream; import java.util.Iterator; import java.util.Properties; -import com.third.v2.lowagie.text.pdf.OutputStreamCounter; +import com.fr.third.v2.lowagie.text.pdf.OutputStreamCounter; /** * An abstract Writer class for documents. diff --git a/fine-itext/src/com/third/v2/lowagie/text/Document.java b/fine-itext/src/com/fr/third/v2/lowagie/text/Document.java similarity index 99% rename from fine-itext/src/com/third/v2/lowagie/text/Document.java rename to fine-itext/src/com/fr/third/v2/lowagie/text/Document.java index d7e70d1c1..3f5ca222d 100644 --- a/fine-itext/src/com/third/v2/lowagie/text/Document.java +++ b/fine-itext/src/com/fr/third/v2/lowagie/text/Document.java @@ -47,7 +47,7 @@ * http://www.lowagie.com/iText/ */ -package com.third.v2.lowagie.text; +package com.fr.third.v2.lowagie.text; import java.text.SimpleDateFormat; import java.util.ArrayList; diff --git a/fine-itext/src/com/third/v2/lowagie/text/DocumentException.java b/fine-itext/src/com/fr/third/v2/lowagie/text/DocumentException.java similarity index 98% rename from fine-itext/src/com/third/v2/lowagie/text/DocumentException.java rename to fine-itext/src/com/fr/third/v2/lowagie/text/DocumentException.java index bfb81c68b..7732caac8 100644 --- a/fine-itext/src/com/third/v2/lowagie/text/DocumentException.java +++ b/fine-itext/src/com/fr/third/v2/lowagie/text/DocumentException.java @@ -48,7 +48,7 @@ * */ -package com.third.v2.lowagie.text; +package com.fr.third.v2.lowagie.text; /** * Signals that an error has occurred in a Document. diff --git a/fine-itext/src/com/third/v2/lowagie/text/Element.java b/fine-itext/src/com/fr/third/v2/lowagie/text/Element.java similarity index 99% rename from fine-itext/src/com/third/v2/lowagie/text/Element.java rename to fine-itext/src/com/fr/third/v2/lowagie/text/Element.java index e5f587178..58d7e42c1 100644 --- a/fine-itext/src/com/third/v2/lowagie/text/Element.java +++ b/fine-itext/src/com/fr/third/v2/lowagie/text/Element.java @@ -47,7 +47,7 @@ * http://www.lowagie.com/iText/ */ -package com.third.v2.lowagie.text; +package com.fr.third.v2.lowagie.text; import java.util.ArrayList; diff --git a/fine-itext/src/com/third/v2/lowagie/text/ElementListener.java b/fine-itext/src/com/fr/third/v2/lowagie/text/ElementListener.java similarity index 98% rename from fine-itext/src/com/third/v2/lowagie/text/ElementListener.java rename to fine-itext/src/com/fr/third/v2/lowagie/text/ElementListener.java index bfdc69341..ca58cc7f5 100644 --- a/fine-itext/src/com/third/v2/lowagie/text/ElementListener.java +++ b/fine-itext/src/com/fr/third/v2/lowagie/text/ElementListener.java @@ -47,7 +47,7 @@ * http://www.lowagie.com/iText/ */ -package com.third.v2.lowagie.text; +package com.fr.third.v2.lowagie.text; import java.util.EventListener; diff --git a/fine-itext/src/com/third/v2/lowagie/text/ElementTags.java b/fine-itext/src/com/fr/third/v2/lowagie/text/ElementTags.java similarity index 99% rename from fine-itext/src/com/third/v2/lowagie/text/ElementTags.java rename to fine-itext/src/com/fr/third/v2/lowagie/text/ElementTags.java index 6ea25b37f..52b61dcc2 100644 --- a/fine-itext/src/com/third/v2/lowagie/text/ElementTags.java +++ b/fine-itext/src/com/fr/third/v2/lowagie/text/ElementTags.java @@ -50,7 +50,7 @@ * http://www.lowagie.com/iText/ */ -package com.third.v2.lowagie.text; +package com.fr.third.v2.lowagie.text; /** * A class that contains all the possible tagnames and their attributes. diff --git a/fine-itext/src/com/third/v2/lowagie/text/ExceptionConverter.java b/fine-itext/src/com/fr/third/v2/lowagie/text/ExceptionConverter.java similarity index 99% rename from fine-itext/src/com/third/v2/lowagie/text/ExceptionConverter.java rename to fine-itext/src/com/fr/third/v2/lowagie/text/ExceptionConverter.java index 431573b4e..5f15cdc54 100644 --- a/fine-itext/src/com/third/v2/lowagie/text/ExceptionConverter.java +++ b/fine-itext/src/com/fr/third/v2/lowagie/text/ExceptionConverter.java @@ -51,7 +51,7 @@ * you aren't using an obsolete version: * http://www.lowagie.com/iText/ */ -package com.third.v2.lowagie.text; +package com.fr.third.v2.lowagie.text; /** * The ExceptionConverter changes a checked exception into an diff --git a/fine-itext/src/com/third/v2/lowagie/text/Font.java b/fine-itext/src/com/fr/third/v2/lowagie/text/Font.java similarity index 99% rename from fine-itext/src/com/third/v2/lowagie/text/Font.java rename to fine-itext/src/com/fr/third/v2/lowagie/text/Font.java index 45b786db6..a9fb4d267 100644 --- a/fine-itext/src/com/third/v2/lowagie/text/Font.java +++ b/fine-itext/src/com/fr/third/v2/lowagie/text/Font.java @@ -47,12 +47,12 @@ * http://www.lowagie.com/iText/ */ -package com.third.v2.lowagie.text; +package com.fr.third.v2.lowagie.text; import java.awt.Color; -import com.third.v2.lowagie.text.html.Markup; -import com.third.v2.lowagie.text.pdf.BaseFont; +import com.fr.third.v2.lowagie.text.html.Markup; +import com.fr.third.v2.lowagie.text.pdf.BaseFont; /** * Contains all the specifications of a font: fontfamily, size, style and color. diff --git a/fine-itext/src/com/third/v2/lowagie/text/FontFactory.java b/fine-itext/src/com/fr/third/v2/lowagie/text/FontFactory.java similarity index 99% rename from fine-itext/src/com/third/v2/lowagie/text/FontFactory.java rename to fine-itext/src/com/fr/third/v2/lowagie/text/FontFactory.java index 09737cdc2..9e7978262 100644 --- a/fine-itext/src/com/third/v2/lowagie/text/FontFactory.java +++ b/fine-itext/src/com/fr/third/v2/lowagie/text/FontFactory.java @@ -47,13 +47,13 @@ * http://www.lowagie.com/iText/ */ -package com.third.v2.lowagie.text; +package com.fr.third.v2.lowagie.text; import java.awt.Color; import java.util.Properties; import java.util.Set; -import com.third.v2.lowagie.text.pdf.BaseFont; +import com.fr.third.v2.lowagie.text.pdf.BaseFont; /** * If you are using True Type fonts, you can declare the paths of the different ttf- and ttc-files diff --git a/fine-itext/src/com/third/v2/lowagie/text/FontFactoryImp.java b/fine-itext/src/com/fr/third/v2/lowagie/text/FontFactoryImp.java similarity index 99% rename from fine-itext/src/com/third/v2/lowagie/text/FontFactoryImp.java rename to fine-itext/src/com/fr/third/v2/lowagie/text/FontFactoryImp.java index 3fb4c4e21..6140f01b7 100644 --- a/fine-itext/src/com/third/v2/lowagie/text/FontFactoryImp.java +++ b/fine-itext/src/com/fr/third/v2/lowagie/text/FontFactoryImp.java @@ -47,7 +47,7 @@ * http://www.lowagie.com/iText/ */ -package com.third.v2.lowagie.text; +package com.fr.third.v2.lowagie.text; import java.awt.Color; import java.io.File; @@ -59,8 +59,8 @@ import java.util.Iterator; import java.util.Properties; import java.util.Set; -import com.third.v2.lowagie.text.html.Markup; -import com.third.v2.lowagie.text.pdf.BaseFont; +import com.fr.third.v2.lowagie.text.html.Markup; +import com.fr.third.v2.lowagie.text.pdf.BaseFont; /** * If you are using True Type fonts, you can declare the paths of the different ttf- and ttc-files diff --git a/fine-itext/src/com/third/v2/lowagie/text/GreekList.java b/fine-itext/src/com/fr/third/v2/lowagie/text/GreekList.java similarity index 97% rename from fine-itext/src/com/third/v2/lowagie/text/GreekList.java rename to fine-itext/src/com/fr/third/v2/lowagie/text/GreekList.java index 9dc54e6db..9d56e7fb6 100644 --- a/fine-itext/src/com/third/v2/lowagie/text/GreekList.java +++ b/fine-itext/src/com/fr/third/v2/lowagie/text/GreekList.java @@ -44,9 +44,9 @@ * you aren't using an obsolete version: * http://www.lowagie.com/iText/ */ -package com.third.v2.lowagie.text; +package com.fr.third.v2.lowagie.text; -import com.third.v2.lowagie.text.factories.GreekAlphabetFactory; +import com.fr.third.v2.lowagie.text.factories.GreekAlphabetFactory; /** * diff --git a/fine-itext/src/com/third/v2/lowagie/text/Header.java b/fine-itext/src/com/fr/third/v2/lowagie/text/Header.java similarity index 98% rename from fine-itext/src/com/third/v2/lowagie/text/Header.java rename to fine-itext/src/com/fr/third/v2/lowagie/text/Header.java index 1ab4f16da..e9c3de4ea 100644 --- a/fine-itext/src/com/third/v2/lowagie/text/Header.java +++ b/fine-itext/src/com/fr/third/v2/lowagie/text/Header.java @@ -47,7 +47,7 @@ * http://www.lowagie.com/iText/ */ -package com.third.v2.lowagie.text; +package com.fr.third.v2.lowagie.text; /** * This is an Element that contains diff --git a/fine-itext/src/com/third/v2/lowagie/text/HeaderFooter.java b/fine-itext/src/com/fr/third/v2/lowagie/text/HeaderFooter.java similarity index 99% rename from fine-itext/src/com/third/v2/lowagie/text/HeaderFooter.java rename to fine-itext/src/com/fr/third/v2/lowagie/text/HeaderFooter.java index d997eb5fc..232bb9da8 100644 --- a/fine-itext/src/com/third/v2/lowagie/text/HeaderFooter.java +++ b/fine-itext/src/com/fr/third/v2/lowagie/text/HeaderFooter.java @@ -47,7 +47,7 @@ * http://www.lowagie.com/iText/ */ -package com.third.v2.lowagie.text; +package com.fr.third.v2.lowagie.text; /** diff --git a/fine-itext/src/com/third/v2/lowagie/text/Image.java b/fine-itext/src/com/fr/third/v2/lowagie/text/Image.java similarity index 97% rename from fine-itext/src/com/third/v2/lowagie/text/Image.java rename to fine-itext/src/com/fr/third/v2/lowagie/text/Image.java index 8a62ff5c2..32f6a53fe 100644 --- a/fine-itext/src/com/third/v2/lowagie/text/Image.java +++ b/fine-itext/src/com/fr/third/v2/lowagie/text/Image.java @@ -47,7 +47,7 @@ * http://www.lowagie.com/iText/ */ -package com.third.v2.lowagie.text; +package com.fr.third.v2.lowagie.text; import java.awt.Graphics2D; import java.awt.color.ICC_Profile; @@ -58,26 +58,26 @@ import java.lang.reflect.Constructor; import java.net.MalformedURLException; import java.net.URL; -import com.third.v2.lowagie.text.pdf.PRIndirectReference; -import com.third.v2.lowagie.text.pdf.PdfArray; -import com.third.v2.lowagie.text.pdf.PdfContentByte; -import com.third.v2.lowagie.text.pdf.PdfDictionary; -import com.third.v2.lowagie.text.pdf.PdfIndirectReference; -import com.third.v2.lowagie.text.pdf.PdfName; -import com.third.v2.lowagie.text.pdf.PdfNumber; -import com.third.v2.lowagie.text.pdf.PdfOCG; -import com.third.v2.lowagie.text.pdf.PdfObject; -import com.third.v2.lowagie.text.pdf.PdfReader; -import com.third.v2.lowagie.text.pdf.PdfStream; -import com.third.v2.lowagie.text.pdf.PdfTemplate; -import com.third.v2.lowagie.text.pdf.PdfWriter; -import com.third.v2.lowagie.text.pdf.RandomAccessFileOrArray; -import com.third.v2.lowagie.text.pdf.codec.BmpImage; -import com.third.v2.lowagie.text.pdf.codec.CCITTG4Encoder; -import com.third.v2.lowagie.text.pdf.codec.GifImage; -import com.third.v2.lowagie.text.pdf.codec.JBIG2Image; -import com.third.v2.lowagie.text.pdf.codec.PngImage; -import com.third.v2.lowagie.text.pdf.codec.TiffImage; +import com.fr.third.v2.lowagie.text.pdf.PRIndirectReference; +import com.fr.third.v2.lowagie.text.pdf.PdfArray; +import com.fr.third.v2.lowagie.text.pdf.PdfContentByte; +import com.fr.third.v2.lowagie.text.pdf.PdfDictionary; +import com.fr.third.v2.lowagie.text.pdf.PdfName; +import com.fr.third.v2.lowagie.text.pdf.PdfNumber; +import com.fr.third.v2.lowagie.text.pdf.PdfOCG; +import com.fr.third.v2.lowagie.text.pdf.PdfObject; +import com.fr.third.v2.lowagie.text.pdf.PdfStream; +import com.fr.third.v2.lowagie.text.pdf.PdfTemplate; +import com.fr.third.v2.lowagie.text.pdf.RandomAccessFileOrArray; +import com.fr.third.v2.lowagie.text.pdf.codec.CCITTG4Encoder; +import com.fr.third.v2.lowagie.text.pdf.codec.GifImage; +import com.fr.third.v2.lowagie.text.pdf.codec.JBIG2Image; +import com.fr.third.v2.lowagie.text.pdf.codec.PngImage; +import com.fr.third.v2.lowagie.text.pdf.codec.TiffImage; +import com.fr.third.v2.lowagie.text.pdf.PdfIndirectReference; +import com.fr.third.v2.lowagie.text.pdf.PdfReader; +import com.fr.third.v2.lowagie.text.pdf.PdfWriter; +import com.fr.third.v2.lowagie.text.pdf.codec.BmpImage; /** * An Image is the representation of a graphic element (JPEG, PNG @@ -576,8 +576,8 @@ public abstract class Image extends Rectangle { "Transparency length must be equal to (componentes * 2)"); if (components == 1 && bpc == 1) { byte g4[] = CCITTG4Encoder.compress(data, width, height); - return Image.getInstance(width, height, false, CCITTG4, - CCITT_BLACKIS1, g4, transparency); + return Image.getInstance(width, height, false, Image.CCITTG4, + Image.CCITT_BLACKIS1, g4, transparency); } Image img = new ImgRaw(width, height, components, bpc, data); img.transparency = transparency; diff --git a/fine-itext/src/com/third/v2/lowagie/text/ImgCCITT.java b/fine-itext/src/com/fr/third/v2/lowagie/text/ImgCCITT.java similarity index 97% rename from fine-itext/src/com/third/v2/lowagie/text/ImgCCITT.java rename to fine-itext/src/com/fr/third/v2/lowagie/text/ImgCCITT.java index 62ca577f8..92effe7c3 100644 --- a/fine-itext/src/com/third/v2/lowagie/text/ImgCCITT.java +++ b/fine-itext/src/com/fr/third/v2/lowagie/text/ImgCCITT.java @@ -47,9 +47,9 @@ * http://www.lowagie.com/iText/ */ -package com.third.v2.lowagie.text; +package com.fr.third.v2.lowagie.text; -import com.third.v2.lowagie.text.pdf.codec.TIFFFaxDecoder; +import com.fr.third.v2.lowagie.text.pdf.codec.TIFFFaxDecoder; import java.net.URL; /** diff --git a/fine-itext/src/com/third/v2/lowagie/text/ImgJBIG2.java b/fine-itext/src/com/fr/third/v2/lowagie/text/ImgJBIG2.java similarity index 99% rename from fine-itext/src/com/third/v2/lowagie/text/ImgJBIG2.java rename to fine-itext/src/com/fr/third/v2/lowagie/text/ImgJBIG2.java index 7751e5a97..7382d0f3b 100644 --- a/fine-itext/src/com/third/v2/lowagie/text/ImgJBIG2.java +++ b/fine-itext/src/com/fr/third/v2/lowagie/text/ImgJBIG2.java @@ -47,7 +47,7 @@ * http://www.lowagie.com/iText/ */ -package com.third.v2.lowagie.text; +package com.fr.third.v2.lowagie.text; import java.net.URL; import java.security.MessageDigest; diff --git a/fine-itext/src/com/third/v2/lowagie/text/ImgRaw.java b/fine-itext/src/com/fr/third/v2/lowagie/text/ImgRaw.java similarity index 98% rename from fine-itext/src/com/third/v2/lowagie/text/ImgRaw.java rename to fine-itext/src/com/fr/third/v2/lowagie/text/ImgRaw.java index 1f229bd3d..fc3674c36 100644 --- a/fine-itext/src/com/third/v2/lowagie/text/ImgRaw.java +++ b/fine-itext/src/com/fr/third/v2/lowagie/text/ImgRaw.java @@ -47,7 +47,7 @@ * http://www.lowagie.com/iText/ */ -package com.third.v2.lowagie.text; +package com.fr.third.v2.lowagie.text; import java.net.URL; diff --git a/fine-itext/src/com/third/v2/lowagie/text/ImgTemplate.java b/fine-itext/src/com/fr/third/v2/lowagie/text/ImgTemplate.java similarity index 97% rename from fine-itext/src/com/third/v2/lowagie/text/ImgTemplate.java rename to fine-itext/src/com/fr/third/v2/lowagie/text/ImgTemplate.java index 05083274c..5248c3de9 100644 --- a/fine-itext/src/com/third/v2/lowagie/text/ImgTemplate.java +++ b/fine-itext/src/com/fr/third/v2/lowagie/text/ImgTemplate.java @@ -47,11 +47,11 @@ * http://www.lowagie.com/iText/ */ -package com.third.v2.lowagie.text; +package com.fr.third.v2.lowagie.text; import java.net.URL; -import com.third.v2.lowagie.text.pdf.PdfTemplate; +import com.fr.third.v2.lowagie.text.pdf.PdfTemplate; /** * PdfTemplate that has to be inserted into the document diff --git a/fine-itext/src/com/third/v2/lowagie/text/ImgWMF.java b/fine-itext/src/com/fr/third/v2/lowagie/text/ImgWMF.java similarity index 96% rename from fine-itext/src/com/third/v2/lowagie/text/ImgWMF.java rename to fine-itext/src/com/fr/third/v2/lowagie/text/ImgWMF.java index ee4560017..e8676c4e2 100644 --- a/fine-itext/src/com/third/v2/lowagie/text/ImgWMF.java +++ b/fine-itext/src/com/fr/third/v2/lowagie/text/ImgWMF.java @@ -47,16 +47,16 @@ * http://www.lowagie.com/iText/ */ -package com.third.v2.lowagie.text; +package com.fr.third.v2.lowagie.text; import java.io.IOException; import java.io.InputStream; import java.net.MalformedURLException; import java.net.URL; -import com.third.v2.lowagie.text.pdf.PdfTemplate; -import com.third.v2.lowagie.text.pdf.codec.wmf.InputMeta; -import com.third.v2.lowagie.text.pdf.codec.wmf.MetaDo; +import com.fr.third.v2.lowagie.text.pdf.PdfTemplate; +import com.fr.third.v2.lowagie.text.pdf.codec.wmf.MetaDo; +import com.fr.third.v2.lowagie.text.pdf.codec.wmf.InputMeta; /** * An ImgWMF is the representation of a windows metafile diff --git a/fine-itext/src/com/third/v2/lowagie/text/Jpeg.java b/fine-itext/src/com/fr/third/v2/lowagie/text/Jpeg.java similarity index 99% rename from fine-itext/src/com/third/v2/lowagie/text/Jpeg.java rename to fine-itext/src/com/fr/third/v2/lowagie/text/Jpeg.java index d674cdd29..1b3c18a7e 100644 --- a/fine-itext/src/com/third/v2/lowagie/text/Jpeg.java +++ b/fine-itext/src/com/fr/third/v2/lowagie/text/Jpeg.java @@ -47,7 +47,7 @@ * http://www.lowagie.com/iText/ */ -package com.third.v2.lowagie.text; +package com.fr.third.v2.lowagie.text; import java.awt.color.ICC_Profile; import java.io.IOException; diff --git a/fine-itext/src/com/third/v2/lowagie/text/Jpeg2000.java b/fine-itext/src/com/fr/third/v2/lowagie/text/Jpeg2000.java similarity index 99% rename from fine-itext/src/com/third/v2/lowagie/text/Jpeg2000.java rename to fine-itext/src/com/fr/third/v2/lowagie/text/Jpeg2000.java index 0ae80beba..7cac09229 100644 --- a/fine-itext/src/com/third/v2/lowagie/text/Jpeg2000.java +++ b/fine-itext/src/com/fr/third/v2/lowagie/text/Jpeg2000.java @@ -47,7 +47,7 @@ * http://www.lowagie.com/iText/ */ -package com.third.v2.lowagie.text; +package com.fr.third.v2.lowagie.text; import java.io.IOException; import java.io.InputStream; diff --git a/fine-itext/src/com/third/v2/lowagie/text/LargeElement.java b/fine-itext/src/com/fr/third/v2/lowagie/text/LargeElement.java similarity index 98% rename from fine-itext/src/com/third/v2/lowagie/text/LargeElement.java rename to fine-itext/src/com/fr/third/v2/lowagie/text/LargeElement.java index 40a7930f4..caba05bd9 100644 --- a/fine-itext/src/com/third/v2/lowagie/text/LargeElement.java +++ b/fine-itext/src/com/fr/third/v2/lowagie/text/LargeElement.java @@ -47,7 +47,7 @@ * http://www.lowagie.com/iText/ */ -package com.third.v2.lowagie.text; +package com.fr.third.v2.lowagie.text; /** * Interface implemented by Element objects that can potentially consume diff --git a/fine-itext/src/com/third/v2/lowagie/text/List.java b/fine-itext/src/com/fr/third/v2/lowagie/text/List.java similarity index 99% rename from fine-itext/src/com/third/v2/lowagie/text/List.java rename to fine-itext/src/com/fr/third/v2/lowagie/text/List.java index d22fe9c1d..bdd92fb12 100644 --- a/fine-itext/src/com/third/v2/lowagie/text/List.java +++ b/fine-itext/src/com/fr/third/v2/lowagie/text/List.java @@ -47,12 +47,12 @@ * http://www.lowagie.com/iText/ */ -package com.third.v2.lowagie.text; +package com.fr.third.v2.lowagie.text; import java.util.ArrayList; import java.util.Iterator; -import com.third.v2.lowagie.text.factories.RomanAlphabetFactory; +import com.fr.third.v2.lowagie.text.factories.RomanAlphabetFactory; /** * A List contains several ListItems. diff --git a/fine-itext/src/com/third/v2/lowagie/text/ListItem.java b/fine-itext/src/com/fr/third/v2/lowagie/text/ListItem.java similarity index 99% rename from fine-itext/src/com/third/v2/lowagie/text/ListItem.java rename to fine-itext/src/com/fr/third/v2/lowagie/text/ListItem.java index 044a91e88..94c32ad46 100644 --- a/fine-itext/src/com/third/v2/lowagie/text/ListItem.java +++ b/fine-itext/src/com/fr/third/v2/lowagie/text/ListItem.java @@ -47,7 +47,7 @@ * http://www.lowagie.com/iText/ */ -package com.third.v2.lowagie.text; +package com.fr.third.v2.lowagie.text; /** * A ListItem is a Paragraph diff --git a/fine-itext/src/com/third/v2/lowagie/text/MPL-1.1.txt b/fine-itext/src/com/fr/third/v2/lowagie/text/MPL-1.1.txt similarity index 100% rename from fine-itext/src/com/third/v2/lowagie/text/MPL-1.1.txt rename to fine-itext/src/com/fr/third/v2/lowagie/text/MPL-1.1.txt diff --git a/fine-itext/src/com/third/v2/lowagie/text/MarkedObject.java b/fine-itext/src/com/fr/third/v2/lowagie/text/MarkedObject.java similarity index 99% rename from fine-itext/src/com/third/v2/lowagie/text/MarkedObject.java rename to fine-itext/src/com/fr/third/v2/lowagie/text/MarkedObject.java index e285fd610..b12e0cde7 100644 --- a/fine-itext/src/com/third/v2/lowagie/text/MarkedObject.java +++ b/fine-itext/src/com/fr/third/v2/lowagie/text/MarkedObject.java @@ -47,7 +47,7 @@ * http://www.lowagie.com/iText/ */ -package com.third.v2.lowagie.text; +package com.fr.third.v2.lowagie.text; import java.util.ArrayList; import java.util.Properties; diff --git a/fine-itext/src/com/third/v2/lowagie/text/MarkedSection.java b/fine-itext/src/com/fr/third/v2/lowagie/text/MarkedSection.java similarity index 99% rename from fine-itext/src/com/third/v2/lowagie/text/MarkedSection.java rename to fine-itext/src/com/fr/third/v2/lowagie/text/MarkedSection.java index 8610473aa..0ed3932ad 100644 --- a/fine-itext/src/com/third/v2/lowagie/text/MarkedSection.java +++ b/fine-itext/src/com/fr/third/v2/lowagie/text/MarkedSection.java @@ -47,7 +47,7 @@ * http://www.lowagie.com/iText/ */ -package com.third.v2.lowagie.text; +package com.fr.third.v2.lowagie.text; import java.util.Collection; import java.util.Iterator; diff --git a/fine-itext/src/com/third/v2/lowagie/text/Meta.java b/fine-itext/src/com/fr/third/v2/lowagie/text/Meta.java similarity index 92% rename from fine-itext/src/com/third/v2/lowagie/text/Meta.java rename to fine-itext/src/com/fr/third/v2/lowagie/text/Meta.java index 3522a2c63..7b20ae84c 100644 --- a/fine-itext/src/com/third/v2/lowagie/text/Meta.java +++ b/fine-itext/src/com/fr/third/v2/lowagie/text/Meta.java @@ -47,7 +47,7 @@ * http://www.lowagie.com/iText/ */ -package com.third.v2.lowagie.text; +package com.fr.third.v2.lowagie.text; import java.util.ArrayList; @@ -181,17 +181,17 @@ public class Meta implements Element { public String getName() { switch (type) { - case SUBJECT: + case Element.SUBJECT: return ElementTags.SUBJECT; - case KEYWORDS: + case Element.KEYWORDS: return ElementTags.KEYWORDS; - case AUTHOR: + case Element.AUTHOR: return ElementTags.AUTHOR; - case TITLE: + case Element.TITLE: return ElementTags.TITLE; - case PRODUCER: + case Element.PRODUCER: return ElementTags.PRODUCER; - case CREATIONDATE: + case Element.CREATIONDATE: return ElementTags.CREATIONDATE; default: return ElementTags.UNKNOWN; @@ -206,24 +206,24 @@ public class Meta implements Element { */ public static int getType(String tag) { if (ElementTags.SUBJECT.equals(tag)) { - return SUBJECT; + return Element.SUBJECT; } if (ElementTags.KEYWORDS.equals(tag)) { - return KEYWORDS; + return Element.KEYWORDS; } if (ElementTags.AUTHOR.equals(tag)) { - return AUTHOR; + return Element.AUTHOR; } if (ElementTags.TITLE.equals(tag)) { - return TITLE; + return Element.TITLE; } if (ElementTags.PRODUCER.equals(tag)) { - return PRODUCER; + return Element.PRODUCER; } if (ElementTags.CREATIONDATE.equals(tag)) { - return CREATIONDATE; + return Element.CREATIONDATE; } - return HEADER; + return Element.HEADER; } } \ No newline at end of file diff --git a/fine-itext/src/com/third/v2/lowagie/text/PageSize.java b/fine-itext/src/com/fr/third/v2/lowagie/text/PageSize.java similarity index 99% rename from fine-itext/src/com/third/v2/lowagie/text/PageSize.java rename to fine-itext/src/com/fr/third/v2/lowagie/text/PageSize.java index bf312d61f..bf8982666 100644 --- a/fine-itext/src/com/third/v2/lowagie/text/PageSize.java +++ b/fine-itext/src/com/fr/third/v2/lowagie/text/PageSize.java @@ -47,7 +47,7 @@ * http://www.lowagie.com/iText/ */ -package com.third.v2.lowagie.text; +package com.fr.third.v2.lowagie.text; import java.lang.reflect.Field; diff --git a/fine-itext/src/com/third/v2/lowagie/text/Paragraph.java b/fine-itext/src/com/fr/third/v2/lowagie/text/Paragraph.java similarity index 99% rename from fine-itext/src/com/third/v2/lowagie/text/Paragraph.java rename to fine-itext/src/com/fr/third/v2/lowagie/text/Paragraph.java index 3900e23d5..49fbb8dff 100644 --- a/fine-itext/src/com/third/v2/lowagie/text/Paragraph.java +++ b/fine-itext/src/com/fr/third/v2/lowagie/text/Paragraph.java @@ -47,7 +47,7 @@ * http://www.lowagie.com/iText/ */ -package com.third.v2.lowagie.text; +package com.fr.third.v2.lowagie.text; /** * A Paragraph is a series of Chunks and/or Phrases. diff --git a/fine-itext/src/com/third/v2/lowagie/text/Phrase.java b/fine-itext/src/com/fr/third/v2/lowagie/text/Phrase.java similarity index 94% rename from fine-itext/src/com/third/v2/lowagie/text/Phrase.java rename to fine-itext/src/com/fr/third/v2/lowagie/text/Phrase.java index 655acec22..a2a119689 100644 --- a/fine-itext/src/com/third/v2/lowagie/text/Phrase.java +++ b/fine-itext/src/com/fr/third/v2/lowagie/text/Phrase.java @@ -47,13 +47,13 @@ * http://www.lowagie.com/iText/ */ -package com.third.v2.lowagie.text; +package com.fr.third.v2.lowagie.text; import java.util.ArrayList; import java.util.Collection; import java.util.Iterator; -import com.third.v2.lowagie.text.pdf.HyphenationEvent; +import com.fr.third.v2.lowagie.text.pdf.HyphenationEvent; /** * A Phrase is a series of Chunks. @@ -227,7 +227,7 @@ public class Phrase extends ArrayList implements TextElementArray { * @return a type */ public int type() { - return PHRASE; + return Element.PHRASE; } /** @@ -273,7 +273,7 @@ public class Phrase extends ArrayList implements TextElementArray { if (o == null) return; try { Element element = (Element) o; - if (element.type() == CHUNK) { + if (element.type() == Element.CHUNK) { Chunk chunk = (Chunk) element; if (!font.isStandardFont()) { chunk.setFont(font.difference(chunk.getFont())); @@ -283,12 +283,12 @@ public class Phrase extends ArrayList implements TextElementArray { } super.add(index, chunk); } - else if (element.type() == PHRASE || - element.type() == ANCHOR || - element.type() == ANNOTATION || - element.type() == TABLE || // line added by David Freels - element.type() == YMARK || - element.type() == MARKED) { + else if (element.type() == Element.PHRASE || + element.type() == Element.ANCHOR || + element.type() == Element.ANNOTATION || + element.type() == Element.TABLE || // line added by David Freels + element.type() == Element.YMARK || + element.type() == Element.MARKED) { super.add(index, element); } else { @@ -319,10 +319,10 @@ public class Phrase extends ArrayList implements TextElementArray { try { Element element = (Element) o; switch(element.type()) { - case CHUNK: + case Element.CHUNK: return addChunk((Chunk) o); - case PHRASE: - case PARAGRAPH: + case Element.PHRASE: + case Element.PARAGRAPH: Phrase phrase = (Phrase) o; boolean success = true; Element e; @@ -336,14 +336,14 @@ public class Phrase extends ArrayList implements TextElementArray { } } return success; - case MARKED: - case ANCHOR: - case ANNOTATION: - case TABLE: // case added by David Freels - case PTABLE: // case added by mr. Karen Vardanyan + case Element.MARKED: + case Element.ANCHOR: + case Element.ANNOTATION: + case Element.TABLE: // case added by David Freels + case Element.PTABLE: // case added by mr. Karen Vardanyan // This will only work for PDF!!! Not for RTF/HTML - case LIST: - case YMARK: + case Element.LIST: + case Element.YMARK: return super.add(o); default: throw new ClassCastException(String.valueOf(element.type())); @@ -494,7 +494,7 @@ public class Phrase extends ArrayList implements TextElementArray { return true; case 1: Element element = (Element) get(0); - if (element.type() == CHUNK && ((Chunk) element).isEmpty()) { + if (element.type() == Element.CHUNK && ((Chunk) element).isEmpty()) { return true; } return false; diff --git a/fine-itext/src/com/third/v2/lowagie/text/Rectangle.java b/fine-itext/src/com/fr/third/v2/lowagie/text/Rectangle.java similarity index 99% rename from fine-itext/src/com/third/v2/lowagie/text/Rectangle.java rename to fine-itext/src/com/fr/third/v2/lowagie/text/Rectangle.java index 1bda3befd..c2833d122 100644 --- a/fine-itext/src/com/third/v2/lowagie/text/Rectangle.java +++ b/fine-itext/src/com/fr/third/v2/lowagie/text/Rectangle.java @@ -47,12 +47,12 @@ * http://www.lowagie.com/iText/ */ -package com.third.v2.lowagie.text; +package com.fr.third.v2.lowagie.text; import java.awt.Color; import java.util.ArrayList; -import com.third.v2.lowagie.text.pdf.GrayColor; +import com.fr.third.v2.lowagie.text.pdf.GrayColor; /** * A Rectangle is the representation of a geometric figure. @@ -211,7 +211,7 @@ public class Rectangle implements Element { * @return a type */ public int type() { - return RECTANGLE; + return Element.RECTANGLE; } /** diff --git a/fine-itext/src/com/third/v2/lowagie/text/RectangleReadOnly.java b/fine-itext/src/com/fr/third/v2/lowagie/text/RectangleReadOnly.java similarity index 99% rename from fine-itext/src/com/third/v2/lowagie/text/RectangleReadOnly.java rename to fine-itext/src/com/fr/third/v2/lowagie/text/RectangleReadOnly.java index 37a3f0eee..b14ba441c 100644 --- a/fine-itext/src/com/third/v2/lowagie/text/RectangleReadOnly.java +++ b/fine-itext/src/com/fr/third/v2/lowagie/text/RectangleReadOnly.java @@ -47,7 +47,7 @@ * http://www.lowagie.com/iText/ */ -package com.third.v2.lowagie.text; +package com.fr.third.v2.lowagie.text; import java.awt.Color; diff --git a/fine-itext/src/com/third/v2/lowagie/text/RomanList.java b/fine-itext/src/com/fr/third/v2/lowagie/text/RomanList.java similarity index 97% rename from fine-itext/src/com/third/v2/lowagie/text/RomanList.java rename to fine-itext/src/com/fr/third/v2/lowagie/text/RomanList.java index ab80976b0..300027010 100644 --- a/fine-itext/src/com/third/v2/lowagie/text/RomanList.java +++ b/fine-itext/src/com/fr/third/v2/lowagie/text/RomanList.java @@ -44,9 +44,9 @@ * you aren't using an obsolete version: * http://www.lowagie.com/iText/ */ -package com.third.v2.lowagie.text; +package com.fr.third.v2.lowagie.text; -import com.third.v2.lowagie.text.factories.RomanNumberFactory; +import com.fr.third.v2.lowagie.text.factories.RomanNumberFactory; /** * diff --git a/fine-itext/src/com/third/v2/lowagie/text/Row.java b/fine-itext/src/com/fr/third/v2/lowagie/text/Row.java similarity index 99% rename from fine-itext/src/com/third/v2/lowagie/text/Row.java rename to fine-itext/src/com/fr/third/v2/lowagie/text/Row.java index 85aae2664..14df7e82d 100644 --- a/fine-itext/src/com/third/v2/lowagie/text/Row.java +++ b/fine-itext/src/com/fr/third/v2/lowagie/text/Row.java @@ -47,7 +47,7 @@ * http://www.lowagie.com/iText/ */ -package com.third.v2.lowagie.text; +package com.fr.third.v2.lowagie.text; import java.util.ArrayList; diff --git a/fine-itext/src/com/third/v2/lowagie/text/RtfElementInterface.java b/fine-itext/src/com/fr/third/v2/lowagie/text/RtfElementInterface.java similarity index 98% rename from fine-itext/src/com/third/v2/lowagie/text/RtfElementInterface.java rename to fine-itext/src/com/fr/third/v2/lowagie/text/RtfElementInterface.java index 978c233f0..a1e20977f 100644 --- a/fine-itext/src/com/third/v2/lowagie/text/RtfElementInterface.java +++ b/fine-itext/src/com/fr/third/v2/lowagie/text/RtfElementInterface.java @@ -47,7 +47,7 @@ * http://www.lowagie.com/iText/ */ -package com.third.v2.lowagie.text; +package com.fr.third.v2.lowagie.text; /** * The RTF jar depends on the iText jar, but the iText jar may not diff --git a/fine-itext/src/com/third/v2/lowagie/text/Section.java b/fine-itext/src/com/fr/third/v2/lowagie/text/Section.java similarity index 99% rename from fine-itext/src/com/third/v2/lowagie/text/Section.java rename to fine-itext/src/com/fr/third/v2/lowagie/text/Section.java index 73138eaf2..03610ad07 100644 --- a/fine-itext/src/com/third/v2/lowagie/text/Section.java +++ b/fine-itext/src/com/fr/third/v2/lowagie/text/Section.java @@ -47,7 +47,7 @@ * http://www.lowagie.com/iText/ */ -package com.third.v2.lowagie.text; +package com.fr.third.v2.lowagie.text; import java.util.ArrayList; import java.util.Collection; diff --git a/fine-itext/src/com/third/v2/lowagie/text/SimpleCell.java b/fine-itext/src/com/fr/third/v2/lowagie/text/SimpleCell.java similarity index 98% rename from fine-itext/src/com/third/v2/lowagie/text/SimpleCell.java rename to fine-itext/src/com/fr/third/v2/lowagie/text/SimpleCell.java index e9cc41f17..21a2fa495 100644 --- a/fine-itext/src/com/third/v2/lowagie/text/SimpleCell.java +++ b/fine-itext/src/com/fr/third/v2/lowagie/text/SimpleCell.java @@ -46,15 +46,15 @@ * you aren't using an obsolete version: * http://www.lowagie.com/iText/ */ -package com.third.v2.lowagie.text; +package com.fr.third.v2.lowagie.text; import java.util.ArrayList; import java.util.Iterator; -import com.third.v2.lowagie.text.pdf.PdfContentByte; -import com.third.v2.lowagie.text.pdf.PdfPCell; -import com.third.v2.lowagie.text.pdf.PdfPCellEvent; -import com.third.v2.lowagie.text.pdf.PdfPTable; +import com.fr.third.v2.lowagie.text.pdf.PdfContentByte; +import com.fr.third.v2.lowagie.text.pdf.PdfPCell; +import com.fr.third.v2.lowagie.text.pdf.PdfPCellEvent; +import com.fr.third.v2.lowagie.text.pdf.PdfPTable; /** * Rectangle that can be used for Cells. diff --git a/fine-itext/src/com/third/v2/lowagie/text/SimpleTable.java b/fine-itext/src/com/fr/third/v2/lowagie/text/SimpleTable.java similarity index 97% rename from fine-itext/src/com/third/v2/lowagie/text/SimpleTable.java rename to fine-itext/src/com/fr/third/v2/lowagie/text/SimpleTable.java index 47d3b8684..d015a2f39 100644 --- a/fine-itext/src/com/third/v2/lowagie/text/SimpleTable.java +++ b/fine-itext/src/com/fr/third/v2/lowagie/text/SimpleTable.java @@ -46,14 +46,14 @@ * you aren't using an obsolete version: * http://www.lowagie.com/iText/ */ -package com.third.v2.lowagie.text; +package com.fr.third.v2.lowagie.text; import java.util.ArrayList; import java.util.Iterator; -import com.third.v2.lowagie.text.pdf.PdfContentByte; -import com.third.v2.lowagie.text.pdf.PdfPTable; -import com.third.v2.lowagie.text.pdf.PdfPTableEvent; +import com.fr.third.v2.lowagie.text.pdf.PdfContentByte; +import com.fr.third.v2.lowagie.text.pdf.PdfPTable; +import com.fr.third.v2.lowagie.text.pdf.PdfPTableEvent; /** * Rectangle that can be used for Cells. @@ -253,7 +253,7 @@ public class SimpleTable extends Rectangle implements PdfPTableEvent, TextElemen Rectangle rect = new Rectangle(width[0], heights[heights.length - 1], width[width.length - 1], heights[0]); rect.cloneNonPositionParameters(this); int bd = rect.getBorder(); - rect.setBorder(Rectangle.NO_BORDER); + rect.setBorder(NO_BORDER); canvases[PdfPTable.BACKGROUNDCANVAS].rectangle(rect); rect.setBorder(bd); rect.setBackgroundColor(null); diff --git a/fine-itext/src/com/third/v2/lowagie/text/SpecialSymbol.java b/fine-itext/src/com/fr/third/v2/lowagie/text/SpecialSymbol.java similarity index 99% rename from fine-itext/src/com/third/v2/lowagie/text/SpecialSymbol.java rename to fine-itext/src/com/fr/third/v2/lowagie/text/SpecialSymbol.java index ebee05b13..a95102f53 100644 --- a/fine-itext/src/com/third/v2/lowagie/text/SpecialSymbol.java +++ b/fine-itext/src/com/fr/third/v2/lowagie/text/SpecialSymbol.java @@ -47,7 +47,7 @@ * http://www.lowagie.com/iText/ */ -package com.third.v2.lowagie.text; +package com.fr.third.v2.lowagie.text; /** * This class contains the symbols that correspond with special symbols. diff --git a/fine-itext/src/com/third/v2/lowagie/text/SplitCharacter.java b/fine-itext/src/com/fr/third/v2/lowagie/text/SplitCharacter.java similarity index 97% rename from fine-itext/src/com/third/v2/lowagie/text/SplitCharacter.java rename to fine-itext/src/com/fr/third/v2/lowagie/text/SplitCharacter.java index bd389983d..b85fbd6e4 100644 --- a/fine-itext/src/com/third/v2/lowagie/text/SplitCharacter.java +++ b/fine-itext/src/com/fr/third/v2/lowagie/text/SplitCharacter.java @@ -47,9 +47,9 @@ * http://www.lowagie.com/iText/ */ -package com.third.v2.lowagie.text; +package com.fr.third.v2.lowagie.text; -import com.third.v2.lowagie.text.pdf.PdfChunk; +import com.fr.third.v2.lowagie.text.pdf.PdfChunk; /** Interface for customizing the split character. * diff --git a/fine-itext/src/com/third/v2/lowagie/text/Table.java b/fine-itext/src/com/fr/third/v2/lowagie/text/Table.java similarity index 98% rename from fine-itext/src/com/third/v2/lowagie/text/Table.java rename to fine-itext/src/com/fr/third/v2/lowagie/text/Table.java index 819879fd0..940af03c0 100644 --- a/fine-itext/src/com/third/v2/lowagie/text/Table.java +++ b/fine-itext/src/com/fr/third/v2/lowagie/text/Table.java @@ -50,15 +50,15 @@ * Steve Ogryzek. Check the CVS repository. */ -package com.third.v2.lowagie.text; +package com.fr.third.v2.lowagie.text; import java.awt.Dimension; import java.awt.Point; import java.util.ArrayList; import java.util.Iterator; -import com.third.v2.lowagie.text.pdf.PdfPCell; -import com.third.v2.lowagie.text.pdf.PdfPTable; +import com.fr.third.v2.lowagie.text.pdf.PdfPCell; +import com.fr.third.v2.lowagie.text.pdf.PdfPTable; /** * A Table is a Rectangle that contains Cells, @@ -170,7 +170,7 @@ public class Table extends Rectangle implements LargeElement { private int lastHeaderRow = -1; /** This is the horizontal alignment. */ - private int alignment = ALIGN_CENTER; + private int alignment = Element.ALIGN_CENTER; /** This is cellpadding. */ private float cellpadding; @@ -314,7 +314,7 @@ public class Table extends Rectangle implements LargeElement { * @return a type */ public int type() { - return TABLE; + return Element.TABLE; } /** @@ -436,14 +436,14 @@ public class Table extends Rectangle implements LargeElement { */ public void setAlignment(String alignment) { if (ElementTags.ALIGN_LEFT.equalsIgnoreCase(alignment)) { - this.alignment = ALIGN_LEFT; + this.alignment = Element.ALIGN_LEFT; return; } if (ElementTags.RIGHT.equalsIgnoreCase(alignment)) { - this.alignment = ALIGN_RIGHT; + this.alignment = Element.ALIGN_RIGHT; return; } - this.alignment = ALIGN_CENTER; + this.alignment = Element.ALIGN_CENTER; } /** @@ -1243,10 +1243,10 @@ public class Table extends Rectangle implements LargeElement { if (aCell.getBackgroundColor() == null) { aCell.setBackgroundColor(defaultCell.getBackgroundColor()); } - if (aCell.getHorizontalAlignment() == ALIGN_UNDEFINED) { + if (aCell.getHorizontalAlignment() == Element.ALIGN_UNDEFINED) { aCell.setHorizontalAlignment(defaultCell.getHorizontalAlignment()); } - if (aCell.getVerticalAlignment() == ALIGN_UNDEFINED) { + if (aCell.getVerticalAlignment() == Element.ALIGN_UNDEFINED) { aCell.setVerticalAlignment(defaultCell.getVerticalAlignment()); } } @@ -1332,13 +1332,13 @@ public class Table extends Rectangle implements LargeElement { } // the border at the left is calculated switch(alignment) { - case ALIGN_LEFT: + case Element.ALIGN_LEFT: w[0] = left; break; - case ALIGN_RIGHT: + case Element.ALIGN_RIGHT: w[0] = left + (totalWidth * (100 - wPercentage)) / 100; break; - case ALIGN_CENTER: + case Element.ALIGN_CENTER: default: w[0] = left + (totalWidth * (100 - wPercentage)) / 200; } diff --git a/fine-itext/src/com/third/v2/lowagie/text/TextElementArray.java b/fine-itext/src/com/fr/third/v2/lowagie/text/TextElementArray.java similarity index 98% rename from fine-itext/src/com/third/v2/lowagie/text/TextElementArray.java rename to fine-itext/src/com/fr/third/v2/lowagie/text/TextElementArray.java index c60fb7ca5..53665c817 100644 --- a/fine-itext/src/com/third/v2/lowagie/text/TextElementArray.java +++ b/fine-itext/src/com/fr/third/v2/lowagie/text/TextElementArray.java @@ -47,7 +47,7 @@ * http://www.lowagie.com/iText/ */ -package com.third.v2.lowagie.text; +package com.fr.third.v2.lowagie.text; /** * Interface for a text element to which other objects can be added. diff --git a/fine-itext/src/com/third/v2/lowagie/text/Utilities.java b/fine-itext/src/com/fr/third/v2/lowagie/text/Utilities.java similarity index 99% rename from fine-itext/src/com/third/v2/lowagie/text/Utilities.java rename to fine-itext/src/com/fr/third/v2/lowagie/text/Utilities.java index 4fd3d1e37..c3cf4ebe4 100644 --- a/fine-itext/src/com/third/v2/lowagie/text/Utilities.java +++ b/fine-itext/src/com/fr/third/v2/lowagie/text/Utilities.java @@ -46,7 +46,7 @@ * you aren't using an obsolete version: * http://www.lowagie.com/iText/ */ -package com.third.v2.lowagie.text; +package com.fr.third.v2.lowagie.text; import java.io.File; import java.io.IOException; @@ -58,7 +58,7 @@ import java.util.Hashtable; import java.util.Properties; import java.util.Set; -import com.third.v2.lowagie.text.pdf.PRTokeniser; +import com.fr.third.v2.lowagie.text.pdf.PRTokeniser; /** * A collection of convenience methods that were present in many different iText diff --git a/fine-itext/src/com/third/v2/lowagie/text/ZapfDingbatsList.java b/fine-itext/src/com/fr/third/v2/lowagie/text/ZapfDingbatsList.java similarity index 99% rename from fine-itext/src/com/third/v2/lowagie/text/ZapfDingbatsList.java rename to fine-itext/src/com/fr/third/v2/lowagie/text/ZapfDingbatsList.java index 658ed3c61..cbf120fed 100644 --- a/fine-itext/src/com/third/v2/lowagie/text/ZapfDingbatsList.java +++ b/fine-itext/src/com/fr/third/v2/lowagie/text/ZapfDingbatsList.java @@ -44,7 +44,7 @@ * you aren't using an obsolete version: * http://www.lowagie.com/iText/ */ -package com.third.v2.lowagie.text; +package com.fr.third.v2.lowagie.text; /** * diff --git a/fine-itext/src/com/third/v2/lowagie/text/ZapfDingbatsNumberList.java b/fine-itext/src/com/fr/third/v2/lowagie/text/ZapfDingbatsNumberList.java similarity index 99% rename from fine-itext/src/com/third/v2/lowagie/text/ZapfDingbatsNumberList.java rename to fine-itext/src/com/fr/third/v2/lowagie/text/ZapfDingbatsNumberList.java index 8b016d58d..562dd331c 100644 --- a/fine-itext/src/com/third/v2/lowagie/text/ZapfDingbatsNumberList.java +++ b/fine-itext/src/com/fr/third/v2/lowagie/text/ZapfDingbatsNumberList.java @@ -44,7 +44,7 @@ * you aren't using an obsolete version: * http://www.lowagie.com/iText/ */ -package com.third.v2.lowagie.text; +package com.fr.third.v2.lowagie.text; /** * diff --git a/fine-itext/src/com/third/v2/lowagie/text/apache_license.txt b/fine-itext/src/com/fr/third/v2/lowagie/text/apache_license.txt similarity index 100% rename from fine-itext/src/com/third/v2/lowagie/text/apache_license.txt rename to fine-itext/src/com/fr/third/v2/lowagie/text/apache_license.txt diff --git a/fine-itext/src/com/third/v2/lowagie/text/exceptions/BadPasswordException.java b/fine-itext/src/com/fr/third/v2/lowagie/text/exceptions/BadPasswordException.java similarity index 98% rename from fine-itext/src/com/third/v2/lowagie/text/exceptions/BadPasswordException.java rename to fine-itext/src/com/fr/third/v2/lowagie/text/exceptions/BadPasswordException.java index fcdf81ff0..410ef9873 100644 --- a/fine-itext/src/com/third/v2/lowagie/text/exceptions/BadPasswordException.java +++ b/fine-itext/src/com/fr/third/v2/lowagie/text/exceptions/BadPasswordException.java @@ -47,7 +47,7 @@ * http://www.lowagie.com/iText/ */ -package com.third.v2.lowagie.text.exceptions; +package com.fr.third.v2.lowagie.text.exceptions; import java.io.IOException; diff --git a/fine-itext/src/com/third/v2/lowagie/text/exceptions/IllegalPdfSyntaxException.java b/fine-itext/src/com/fr/third/v2/lowagie/text/exceptions/IllegalPdfSyntaxException.java similarity index 98% rename from fine-itext/src/com/third/v2/lowagie/text/exceptions/IllegalPdfSyntaxException.java rename to fine-itext/src/com/fr/third/v2/lowagie/text/exceptions/IllegalPdfSyntaxException.java index e3bafe425..7df37bea3 100644 --- a/fine-itext/src/com/third/v2/lowagie/text/exceptions/IllegalPdfSyntaxException.java +++ b/fine-itext/src/com/fr/third/v2/lowagie/text/exceptions/IllegalPdfSyntaxException.java @@ -47,7 +47,7 @@ * http://www.lowagie.com/iText/ */ -package com.third.v2.lowagie.text.exceptions; +package com.fr.third.v2.lowagie.text.exceptions; /** * Typed exception used when creating PDF syntax that isn't valid. diff --git a/fine-itext/src/com/third/v2/lowagie/text/exceptions/InvalidPdfException.java b/fine-itext/src/com/fr/third/v2/lowagie/text/exceptions/InvalidPdfException.java similarity index 98% rename from fine-itext/src/com/third/v2/lowagie/text/exceptions/InvalidPdfException.java rename to fine-itext/src/com/fr/third/v2/lowagie/text/exceptions/InvalidPdfException.java index 6a4962023..17d0e0c98 100644 --- a/fine-itext/src/com/third/v2/lowagie/text/exceptions/InvalidPdfException.java +++ b/fine-itext/src/com/fr/third/v2/lowagie/text/exceptions/InvalidPdfException.java @@ -47,7 +47,7 @@ * http://www.lowagie.com/iText/ */ -package com.third.v2.lowagie.text.exceptions; +package com.fr.third.v2.lowagie.text.exceptions; import java.io.IOException; diff --git a/fine-itext/src/com/third/v2/lowagie/text/exceptions/UnsupportedPdfException.java b/fine-itext/src/com/fr/third/v2/lowagie/text/exceptions/UnsupportedPdfException.java similarity index 98% rename from fine-itext/src/com/third/v2/lowagie/text/exceptions/UnsupportedPdfException.java rename to fine-itext/src/com/fr/third/v2/lowagie/text/exceptions/UnsupportedPdfException.java index 83324bbe4..a729d16b4 100644 --- a/fine-itext/src/com/third/v2/lowagie/text/exceptions/UnsupportedPdfException.java +++ b/fine-itext/src/com/fr/third/v2/lowagie/text/exceptions/UnsupportedPdfException.java @@ -47,7 +47,7 @@ * http://www.lowagie.com/iText/ */ -package com.third.v2.lowagie.text.exceptions; +package com.fr.third.v2.lowagie.text.exceptions; /** * Typed exception used when opening an existing PDF document. * Gets thrown when the document isn't a valid PDF document according to iText, diff --git a/fine-itext/src/com/third/v2/lowagie/text/factories/ElementFactory.java b/fine-itext/src/com/fr/third/v2/lowagie/text/factories/ElementFactory.java similarity index 95% rename from fine-itext/src/com/third/v2/lowagie/text/factories/ElementFactory.java rename to fine-itext/src/com/fr/third/v2/lowagie/text/factories/ElementFactory.java index 31e56dafb..890569168 100644 --- a/fine-itext/src/com/third/v2/lowagie/text/factories/ElementFactory.java +++ b/fine-itext/src/com/fr/third/v2/lowagie/text/factories/ElementFactory.java @@ -49,7 +49,7 @@ * you aren't using an obsolete version: * http://www.lowagie.com/iText/ */ -package com.third.v2.lowagie.text.factories; +package com.fr.third.v2.lowagie.text.factories; import java.awt.Color; import java.io.IOException; @@ -58,25 +58,25 @@ import java.util.ArrayList; import java.util.Properties; import java.util.StringTokenizer; -import com.third.v2.lowagie.text.Anchor; -import com.third.v2.lowagie.text.Annotation; -import com.third.v2.lowagie.text.BadElementException; -import com.third.v2.lowagie.text.Cell; -import com.third.v2.lowagie.text.ChapterAutoNumber; -import com.third.v2.lowagie.text.Chunk; -import com.third.v2.lowagie.text.ElementTags; -import com.third.v2.lowagie.text.ExceptionConverter; -import com.third.v2.lowagie.text.FontFactory; -import com.third.v2.lowagie.text.Image; -import com.third.v2.lowagie.text.List; -import com.third.v2.lowagie.text.ListItem; -import com.third.v2.lowagie.text.Paragraph; -import com.third.v2.lowagie.text.Phrase; -import com.third.v2.lowagie.text.Rectangle; -import com.third.v2.lowagie.text.Section; -import com.third.v2.lowagie.text.Table; -import com.third.v2.lowagie.text.Utilities; -import com.third.v2.lowagie.text.html.Markup; +import com.fr.third.v2.lowagie.text.Annotation; +import com.fr.third.v2.lowagie.text.ExceptionConverter; +import com.fr.third.v2.lowagie.text.FontFactory; +import com.fr.third.v2.lowagie.text.List; +import com.fr.third.v2.lowagie.text.html.Markup; +import com.fr.third.v2.lowagie.text.Anchor; +import com.fr.third.v2.lowagie.text.BadElementException; +import com.fr.third.v2.lowagie.text.Cell; +import com.fr.third.v2.lowagie.text.ChapterAutoNumber; +import com.fr.third.v2.lowagie.text.Chunk; +import com.fr.third.v2.lowagie.text.ElementTags; +import com.fr.third.v2.lowagie.text.Image; +import com.fr.third.v2.lowagie.text.ListItem; +import com.fr.third.v2.lowagie.text.Paragraph; +import com.fr.third.v2.lowagie.text.Phrase; +import com.fr.third.v2.lowagie.text.Rectangle; +import com.fr.third.v2.lowagie.text.Section; +import com.fr.third.v2.lowagie.text.Table; +import com.fr.third.v2.lowagie.text.Utilities; /** * This class is able to create Element objects based on a list of properties. diff --git a/fine-itext/src/com/third/v2/lowagie/text/factories/GreekAlphabetFactory.java b/fine-itext/src/com/fr/third/v2/lowagie/text/factories/GreekAlphabetFactory.java similarity index 97% rename from fine-itext/src/com/third/v2/lowagie/text/factories/GreekAlphabetFactory.java rename to fine-itext/src/com/fr/third/v2/lowagie/text/factories/GreekAlphabetFactory.java index df126f54c..5ba8cc75c 100644 --- a/fine-itext/src/com/third/v2/lowagie/text/factories/GreekAlphabetFactory.java +++ b/fine-itext/src/com/fr/third/v2/lowagie/text/factories/GreekAlphabetFactory.java @@ -46,9 +46,9 @@ * you aren't using an obsolete version: * http://www.lowagie.com/iText/ */ -package com.third.v2.lowagie.text.factories; +package com.fr.third.v2.lowagie.text.factories; -import com.third.v2.lowagie.text.SpecialSymbol; +import com.fr.third.v2.lowagie.text.SpecialSymbol; /** * This class can produce String combinations representing a number built with diff --git a/fine-itext/src/com/third/v2/lowagie/text/factories/RomanAlphabetFactory.java b/fine-itext/src/com/fr/third/v2/lowagie/text/factories/RomanAlphabetFactory.java similarity index 98% rename from fine-itext/src/com/third/v2/lowagie/text/factories/RomanAlphabetFactory.java rename to fine-itext/src/com/fr/third/v2/lowagie/text/factories/RomanAlphabetFactory.java index b4e304b9b..5d6d6210e 100644 --- a/fine-itext/src/com/third/v2/lowagie/text/factories/RomanAlphabetFactory.java +++ b/fine-itext/src/com/fr/third/v2/lowagie/text/factories/RomanAlphabetFactory.java @@ -47,7 +47,7 @@ * http://www.lowagie.com/iText/ */ -package com.third.v2.lowagie.text.factories; +package com.fr.third.v2.lowagie.text.factories; /** * This class can produce String combinations representing a number. diff --git a/fine-itext/src/com/third/v2/lowagie/text/factories/RomanNumberFactory.java b/fine-itext/src/com/fr/third/v2/lowagie/text/factories/RomanNumberFactory.java similarity index 99% rename from fine-itext/src/com/third/v2/lowagie/text/factories/RomanNumberFactory.java rename to fine-itext/src/com/fr/third/v2/lowagie/text/factories/RomanNumberFactory.java index 0a2253bf9..7edc45aeb 100644 --- a/fine-itext/src/com/third/v2/lowagie/text/factories/RomanNumberFactory.java +++ b/fine-itext/src/com/fr/third/v2/lowagie/text/factories/RomanNumberFactory.java @@ -46,7 +46,7 @@ * you aren't using an obsolete version: * http://www.lowagie.com/iText/ */ -package com.third.v2.lowagie.text.factories; +package com.fr.third.v2.lowagie.text.factories; /** * This class can produce String combinations representing a roman number. */ diff --git a/fine-itext/src/com/third/v2/lowagie/text/html/HtmlEncoder.java b/fine-itext/src/com/fr/third/v2/lowagie/text/html/HtmlEncoder.java similarity index 98% rename from fine-itext/src/com/third/v2/lowagie/text/html/HtmlEncoder.java rename to fine-itext/src/com/fr/third/v2/lowagie/text/html/HtmlEncoder.java index 24142e64f..29a1ef36e 100644 --- a/fine-itext/src/com/third/v2/lowagie/text/html/HtmlEncoder.java +++ b/fine-itext/src/com/fr/third/v2/lowagie/text/html/HtmlEncoder.java @@ -47,11 +47,11 @@ * http://www.lowagie.com/iText/ */ -package com.third.v2.lowagie.text.html; +package com.fr.third.v2.lowagie.text.html; import java.awt.Color; -import com.third.v2.lowagie.text.Element; +import com.fr.third.v2.lowagie.text.Element; /** * This class converts a String to the HTML-format of a String. diff --git a/fine-itext/src/com/third/v2/lowagie/text/html/HtmlParser.java b/fine-itext/src/com/fr/third/v2/lowagie/text/html/HtmlParser.java similarity index 96% rename from fine-itext/src/com/third/v2/lowagie/text/html/HtmlParser.java rename to fine-itext/src/com/fr/third/v2/lowagie/text/html/HtmlParser.java index 0dfc81f48..085d03317 100644 --- a/fine-itext/src/com/third/v2/lowagie/text/html/HtmlParser.java +++ b/fine-itext/src/com/fr/third/v2/lowagie/text/html/HtmlParser.java @@ -47,18 +47,19 @@ * http://www.lowagie.com/iText/ */ -package com.third.v2.lowagie.text.html; +package com.fr.third.v2.lowagie.text.html; import java.io.IOException; import java.io.InputStream; import java.io.Reader; -import com.third.v2.lowagie.text.DocListener; -import com.third.v2.lowagie.text.ExceptionConverter; -import com.third.v2.lowagie.text.xml.XmlParser; +import com.fr.third.v2.lowagie.text.ExceptionConverter; import org.xml.sax.InputSource; import org.xml.sax.SAXException; +import com.fr.third.v2.lowagie.text.DocListener; +import com.fr.third.v2.lowagie.text.xml.XmlParser; + /** * This class can be used to parse some HTML files. */ diff --git a/fine-itext/src/com/third/v2/lowagie/text/html/HtmlPeer.java b/fine-itext/src/com/fr/third/v2/lowagie/text/html/HtmlPeer.java similarity index 96% rename from fine-itext/src/com/third/v2/lowagie/text/html/HtmlPeer.java rename to fine-itext/src/com/fr/third/v2/lowagie/text/html/HtmlPeer.java index ea69e60b6..7896c6e5b 100644 --- a/fine-itext/src/com/third/v2/lowagie/text/html/HtmlPeer.java +++ b/fine-itext/src/com/fr/third/v2/lowagie/text/html/HtmlPeer.java @@ -47,14 +47,14 @@ * http://www.lowagie.com/iText/ */ -package com.third.v2.lowagie.text.html; +package com.fr.third.v2.lowagie.text.html; import java.util.Properties; -import com.third.v2.lowagie.text.ElementTags; +import com.fr.third.v2.lowagie.text.xml.XmlPeer; import org.xml.sax.Attributes; -import com.third.v2.lowagie.text.xml.XmlPeer; +import com.fr.third.v2.lowagie.text.ElementTags; /** * This interface is implemented by the peer of all the iText objects. diff --git a/fine-itext/src/com/third/v2/lowagie/text/html/HtmlTagMap.java b/fine-itext/src/com/fr/third/v2/lowagie/text/html/HtmlTagMap.java similarity index 98% rename from fine-itext/src/com/third/v2/lowagie/text/html/HtmlTagMap.java rename to fine-itext/src/com/fr/third/v2/lowagie/text/html/HtmlTagMap.java index bff242c49..e33d41d95 100644 --- a/fine-itext/src/com/third/v2/lowagie/text/html/HtmlTagMap.java +++ b/fine-itext/src/com/fr/third/v2/lowagie/text/html/HtmlTagMap.java @@ -50,12 +50,12 @@ * http://www.lowagie.com/iText/ */ -package com.third.v2.lowagie.text.html; +package com.fr.third.v2.lowagie.text.html; import java.util.HashMap; -import com.third.v2.lowagie.text.ElementTags; -import com.third.v2.lowagie.text.FontFactory; +import com.fr.third.v2.lowagie.text.FontFactory; +import com.fr.third.v2.lowagie.text.ElementTags; /** * The Tags-class maps several XHTML-tags to iText-objects. diff --git a/fine-itext/src/com/third/v2/lowagie/text/html/HtmlTags.java b/fine-itext/src/com/fr/third/v2/lowagie/text/html/HtmlTags.java similarity index 99% rename from fine-itext/src/com/third/v2/lowagie/text/html/HtmlTags.java rename to fine-itext/src/com/fr/third/v2/lowagie/text/html/HtmlTags.java index fcbfb1206..24defd1f6 100644 --- a/fine-itext/src/com/third/v2/lowagie/text/html/HtmlTags.java +++ b/fine-itext/src/com/fr/third/v2/lowagie/text/html/HtmlTags.java @@ -50,9 +50,9 @@ * http://www.lowagie.com/iText/ */ -package com.third.v2.lowagie.text.html; +package com.fr.third.v2.lowagie.text.html; -import com.third.v2.lowagie.text.ElementTags; +import com.fr.third.v2.lowagie.text.ElementTags; /** * A class that contains all the possible tagnames and their attributes. diff --git a/fine-itext/src/com/third/v2/lowagie/text/html/HtmlWriter.java b/fine-itext/src/com/fr/third/v2/lowagie/text/html/HtmlWriter.java similarity index 96% rename from fine-itext/src/com/third/v2/lowagie/text/html/HtmlWriter.java rename to fine-itext/src/com/fr/third/v2/lowagie/text/html/HtmlWriter.java index 2fd7ef662..4c06dd206 100644 --- a/fine-itext/src/com/third/v2/lowagie/text/html/HtmlWriter.java +++ b/fine-itext/src/com/fr/third/v2/lowagie/text/html/HtmlWriter.java @@ -47,7 +47,7 @@ * http://www.lowagie.com/iText/ */ -package com.third.v2.lowagie.text.html; +package com.fr.third.v2.lowagie.text.html; import java.io.IOException; import java.io.OutputStream; @@ -59,33 +59,33 @@ import java.util.Iterator; import java.util.Properties; import java.util.Stack; -import com.third.v2.lowagie.text.Anchor; -import com.third.v2.lowagie.text.Annotation; -import com.third.v2.lowagie.text.BadElementException; -import com.third.v2.lowagie.text.Cell; -import com.third.v2.lowagie.text.Chunk; -import com.third.v2.lowagie.text.DocWriter; -import com.third.v2.lowagie.text.Document; -import com.third.v2.lowagie.text.DocumentException; -import com.third.v2.lowagie.text.Element; -import com.third.v2.lowagie.text.ExceptionConverter; -import com.third.v2.lowagie.text.Font; -import com.third.v2.lowagie.text.Header; -import com.third.v2.lowagie.text.HeaderFooter; -import com.third.v2.lowagie.text.Image; -import com.third.v2.lowagie.text.List; -import com.third.v2.lowagie.text.ListItem; -import com.third.v2.lowagie.text.MarkedObject; -import com.third.v2.lowagie.text.MarkedSection; -import com.third.v2.lowagie.text.Meta; -import com.third.v2.lowagie.text.Paragraph; -import com.third.v2.lowagie.text.Phrase; -import com.third.v2.lowagie.text.Rectangle; -import com.third.v2.lowagie.text.Row; -import com.third.v2.lowagie.text.Section; -import com.third.v2.lowagie.text.SimpleTable; -import com.third.v2.lowagie.text.Table; -import com.third.v2.lowagie.text.pdf.BaseFont; +import com.fr.third.v2.lowagie.text.Anchor; +import com.fr.third.v2.lowagie.text.Annotation; +import com.fr.third.v2.lowagie.text.BadElementException; +import com.fr.third.v2.lowagie.text.Cell; +import com.fr.third.v2.lowagie.text.Chunk; +import com.fr.third.v2.lowagie.text.DocWriter; +import com.fr.third.v2.lowagie.text.Document; +import com.fr.third.v2.lowagie.text.DocumentException; +import com.fr.third.v2.lowagie.text.Element; +import com.fr.third.v2.lowagie.text.ExceptionConverter; +import com.fr.third.v2.lowagie.text.Font; +import com.fr.third.v2.lowagie.text.Header; +import com.fr.third.v2.lowagie.text.HeaderFooter; +import com.fr.third.v2.lowagie.text.Image; +import com.fr.third.v2.lowagie.text.List; +import com.fr.third.v2.lowagie.text.ListItem; +import com.fr.third.v2.lowagie.text.MarkedSection; +import com.fr.third.v2.lowagie.text.Meta; +import com.fr.third.v2.lowagie.text.Paragraph; +import com.fr.third.v2.lowagie.text.Rectangle; +import com.fr.third.v2.lowagie.text.Row; +import com.fr.third.v2.lowagie.text.Section; +import com.fr.third.v2.lowagie.text.SimpleTable; +import com.fr.third.v2.lowagie.text.Table; +import com.fr.third.v2.lowagie.text.MarkedObject; +import com.fr.third.v2.lowagie.text.Phrase; +import com.fr.third.v2.lowagie.text.pdf.BaseFont; /** * A DocWriter class for HTML. diff --git a/fine-itext/src/com/third/v2/lowagie/text/html/Markup.java b/fine-itext/src/com/fr/third/v2/lowagie/text/html/Markup.java similarity index 99% rename from fine-itext/src/com/third/v2/lowagie/text/html/Markup.java rename to fine-itext/src/com/fr/third/v2/lowagie/text/html/Markup.java index df83c6cfc..8706354cd 100644 --- a/fine-itext/src/com/third/v2/lowagie/text/html/Markup.java +++ b/fine-itext/src/com/fr/third/v2/lowagie/text/html/Markup.java @@ -50,7 +50,7 @@ * http://www.lowagie.com/iText/ */ -package com.third.v2.lowagie.text.html; +package com.fr.third.v2.lowagie.text.html; import java.awt.Color; import java.util.Properties; diff --git a/fine-itext/src/com/third/v2/lowagie/text/html/SAXmyHtmlHandler.java b/fine-itext/src/com/fr/third/v2/lowagie/text/html/SAXmyHtmlHandler.java similarity index 95% rename from fine-itext/src/com/third/v2/lowagie/text/html/SAXmyHtmlHandler.java rename to fine-itext/src/com/fr/third/v2/lowagie/text/html/SAXmyHtmlHandler.java index e71f211e8..3eb21f730 100644 --- a/fine-itext/src/com/third/v2/lowagie/text/html/SAXmyHtmlHandler.java +++ b/fine-itext/src/com/fr/third/v2/lowagie/text/html/SAXmyHtmlHandler.java @@ -47,21 +47,21 @@ * http://www.lowagie.com/iText/ */ -package com.third.v2.lowagie.text.html; +package com.fr.third.v2.lowagie.text.html; import java.util.HashMap; import java.util.Properties; -import com.third.v2.lowagie.text.DocumentException; -import com.third.v2.lowagie.text.ElementTags; +import com.fr.third.v2.lowagie.text.DocumentException; +import com.fr.third.v2.lowagie.text.Element; +import com.fr.third.v2.lowagie.text.ExceptionConverter; +import com.fr.third.v2.lowagie.text.xml.SAXiTextHandler; +import com.fr.third.v2.lowagie.text.xml.XmlPeer; import org.xml.sax.Attributes; -import com.third.v2.lowagie.text.DocListener; -import com.third.v2.lowagie.text.Element; -import com.third.v2.lowagie.text.ExceptionConverter; -import com.third.v2.lowagie.text.pdf.BaseFont; -import com.third.v2.lowagie.text.xml.SAXiTextHandler; -import com.third.v2.lowagie.text.xml.XmlPeer; +import com.fr.third.v2.lowagie.text.DocListener; +import com.fr.third.v2.lowagie.text.ElementTags; +import com.fr.third.v2.lowagie.text.pdf.BaseFont; /** * The Tags-class maps several XHTML-tags to iText-objects. diff --git a/fine-itext/src/com/third/v2/lowagie/text/html/WebColors.java b/fine-itext/src/com/fr/third/v2/lowagie/text/html/WebColors.java similarity index 99% rename from fine-itext/src/com/third/v2/lowagie/text/html/WebColors.java rename to fine-itext/src/com/fr/third/v2/lowagie/text/html/WebColors.java index dfc53e2ca..30924ff60 100644 --- a/fine-itext/src/com/third/v2/lowagie/text/html/WebColors.java +++ b/fine-itext/src/com/fr/third/v2/lowagie/text/html/WebColors.java @@ -47,7 +47,7 @@ * http://www.lowagie.com/iText/ */ -package com.third.v2.lowagie.text.html; +package com.fr.third.v2.lowagie.text.html; import java.awt.Color; import java.util.HashMap; diff --git a/fine-itext/src/com/third/v2/lowagie/text/html/simpleparser/ALink.java b/fine-itext/src/com/fr/third/v2/lowagie/text/html/simpleparser/ALink.java similarity index 96% rename from fine-itext/src/com/third/v2/lowagie/text/html/simpleparser/ALink.java rename to fine-itext/src/com/fr/third/v2/lowagie/text/html/simpleparser/ALink.java index f0ea90db8..cd2c96628 100644 --- a/fine-itext/src/com/third/v2/lowagie/text/html/simpleparser/ALink.java +++ b/fine-itext/src/com/fr/third/v2/lowagie/text/html/simpleparser/ALink.java @@ -45,10 +45,9 @@ * http://www.lowagie.com/iText/ */ -package com.third.v2.lowagie.text.html.simpleparser; - -import com.third.v2.lowagie.text.Paragraph; +package com.fr.third.v2.lowagie.text.html.simpleparser; +import com.fr.third.v2.lowagie.text.Paragraph; /** * * @author psoares diff --git a/fine-itext/src/com/third/v2/lowagie/text/html/simpleparser/ChainedProperties.java b/fine-itext/src/com/fr/third/v2/lowagie/text/html/simpleparser/ChainedProperties.java similarity index 97% rename from fine-itext/src/com/third/v2/lowagie/text/html/simpleparser/ChainedProperties.java rename to fine-itext/src/com/fr/third/v2/lowagie/text/html/simpleparser/ChainedProperties.java index 676933a4c..704530572 100644 --- a/fine-itext/src/com/third/v2/lowagie/text/html/simpleparser/ChainedProperties.java +++ b/fine-itext/src/com/fr/third/v2/lowagie/text/html/simpleparser/ChainedProperties.java @@ -48,10 +48,9 @@ * http://www.lowagie.com/iText/ */ -package com.third.v2.lowagie.text.html.simpleparser; - -import com.third.v2.lowagie.text.ElementTags; +package com.fr.third.v2.lowagie.text.html.simpleparser; +import com.fr.third.v2.lowagie.text.ElementTags; import java.util.ArrayList; import java.util.HashMap; diff --git a/fine-itext/src/com/third/v2/lowagie/text/html/simpleparser/FactoryProperties.java b/fine-itext/src/com/fr/third/v2/lowagie/text/html/simpleparser/FactoryProperties.java similarity index 95% rename from fine-itext/src/com/third/v2/lowagie/text/html/simpleparser/FactoryProperties.java rename to fine-itext/src/com/fr/third/v2/lowagie/text/html/simpleparser/FactoryProperties.java index d6a8dd3e3..df6a33c9e 100644 --- a/fine-itext/src/com/third/v2/lowagie/text/html/simpleparser/FactoryProperties.java +++ b/fine-itext/src/com/fr/third/v2/lowagie/text/html/simpleparser/FactoryProperties.java @@ -48,7 +48,7 @@ * http://www.lowagie.com/iText/ */ -package com.third.v2.lowagie.text.html.simpleparser; +package com.fr.third.v2.lowagie.text.html.simpleparser; import java.awt.Color; import java.util.HashMap; @@ -56,19 +56,19 @@ import java.util.Iterator; import java.util.Properties; import java.util.StringTokenizer; -import com.third.v2.lowagie.text.Chunk; -import com.third.v2.lowagie.text.Element; -import com.third.v2.lowagie.text.ElementTags; -import com.third.v2.lowagie.text.Font; -import com.third.v2.lowagie.text.FontFactory; -import com.third.v2.lowagie.text.FontFactoryImp; -import com.third.v2.lowagie.text.ListItem; -import com.third.v2.lowagie.text.Paragraph; -import com.third.v2.lowagie.text.html.Markup; -import com.third.v2.lowagie.text.html.HtmlTags; -import com.third.v2.lowagie.text.pdf.BaseFont; -import com.third.v2.lowagie.text.pdf.HyphenationAuto; -import com.third.v2.lowagie.text.pdf.HyphenationEvent; +import com.fr.third.v2.lowagie.text.Font; +import com.fr.third.v2.lowagie.text.FontFactory; +import com.fr.third.v2.lowagie.text.html.HtmlTags; +import com.fr.third.v2.lowagie.text.html.Markup; +import com.fr.third.v2.lowagie.text.Chunk; +import com.fr.third.v2.lowagie.text.Element; +import com.fr.third.v2.lowagie.text.ElementTags; +import com.fr.third.v2.lowagie.text.FontFactoryImp; +import com.fr.third.v2.lowagie.text.ListItem; +import com.fr.third.v2.lowagie.text.Paragraph; +import com.fr.third.v2.lowagie.text.pdf.BaseFont; +import com.fr.third.v2.lowagie.text.pdf.HyphenationAuto; +import com.fr.third.v2.lowagie.text.pdf.HyphenationEvent; /** * diff --git a/fine-itext/src/com/third/v2/lowagie/text/html/simpleparser/HTMLWorker.java b/fine-itext/src/com/fr/third/v2/lowagie/text/html/simpleparser/HTMLWorker.java similarity index 94% rename from fine-itext/src/com/third/v2/lowagie/text/html/simpleparser/HTMLWorker.java rename to fine-itext/src/com/fr/third/v2/lowagie/text/html/simpleparser/HTMLWorker.java index 96f80289c..92eadadd7 100644 --- a/fine-itext/src/com/third/v2/lowagie/text/html/simpleparser/HTMLWorker.java +++ b/fine-itext/src/com/fr/third/v2/lowagie/text/html/simpleparser/HTMLWorker.java @@ -48,7 +48,7 @@ * http://www.lowagie.com/iText/ */ -package com.third.v2.lowagie.text.html.simpleparser; +package com.fr.third.v2.lowagie.text.html.simpleparser; import java.io.File; import java.io.IOException; @@ -58,27 +58,27 @@ import java.util.HashMap; import java.util.Stack; import java.util.StringTokenizer; -import com.third.v2.lowagie.text.html.HtmlTags; -import com.third.v2.lowagie.text.html.Markup; -import com.third.v2.lowagie.text.Chunk; -import com.third.v2.lowagie.text.DocListener; -import com.third.v2.lowagie.text.DocumentException; -import com.third.v2.lowagie.text.Element; -import com.third.v2.lowagie.text.ElementTags; -import com.third.v2.lowagie.text.ExceptionConverter; -import com.third.v2.lowagie.text.FontFactoryImp; -import com.third.v2.lowagie.text.HeaderFooter; -import com.third.v2.lowagie.text.Image; -import com.third.v2.lowagie.text.ListItem; -import com.third.v2.lowagie.text.Paragraph; -import com.third.v2.lowagie.text.Phrase; -import com.third.v2.lowagie.text.Rectangle; -import com.third.v2.lowagie.text.TextElementArray; -import com.third.v2.lowagie.text.pdf.PdfPTable; -import com.third.v2.lowagie.text.pdf.draw.LineSeparator; -import com.third.v2.lowagie.text.xml.simpleparser.SimpleXMLDocHandler; -import com.third.v2.lowagie.text.xml.simpleparser.SimpleXMLParser; -import com.third.v2.lowagie.text.List; +import com.fr.third.v2.lowagie.text.ExceptionConverter; +import com.fr.third.v2.lowagie.text.List; +import com.fr.third.v2.lowagie.text.html.HtmlTags; +import com.fr.third.v2.lowagie.text.html.Markup; +import com.fr.third.v2.lowagie.text.pdf.draw.LineSeparator; +import com.fr.third.v2.lowagie.text.xml.simpleparser.SimpleXMLParser; +import com.fr.third.v2.lowagie.text.Chunk; +import com.fr.third.v2.lowagie.text.DocListener; +import com.fr.third.v2.lowagie.text.DocumentException; +import com.fr.third.v2.lowagie.text.Element; +import com.fr.third.v2.lowagie.text.ElementTags; +import com.fr.third.v2.lowagie.text.FontFactoryImp; +import com.fr.third.v2.lowagie.text.HeaderFooter; +import com.fr.third.v2.lowagie.text.Image; +import com.fr.third.v2.lowagie.text.ListItem; +import com.fr.third.v2.lowagie.text.Paragraph; +import com.fr.third.v2.lowagie.text.Phrase; +import com.fr.third.v2.lowagie.text.Rectangle; +import com.fr.third.v2.lowagie.text.TextElementArray; +import com.fr.third.v2.lowagie.text.pdf.PdfPTable; +import com.fr.third.v2.lowagie.text.xml.simpleparser.SimpleXMLDocHandler; public class HTMLWorker implements SimpleXMLDocHandler, DocListener { diff --git a/fine-itext/src/com/third/v2/lowagie/text/html/simpleparser/ImageProvider.java b/fine-itext/src/com/fr/third/v2/lowagie/text/html/simpleparser/ImageProvider.java similarity index 94% rename from fine-itext/src/com/third/v2/lowagie/text/html/simpleparser/ImageProvider.java rename to fine-itext/src/com/fr/third/v2/lowagie/text/html/simpleparser/ImageProvider.java index 31566e9af..c758d3256 100644 --- a/fine-itext/src/com/third/v2/lowagie/text/html/simpleparser/ImageProvider.java +++ b/fine-itext/src/com/fr/third/v2/lowagie/text/html/simpleparser/ImageProvider.java @@ -46,11 +46,10 @@ */ -package com.third.v2.lowagie.text.html.simpleparser; - -import com.third.v2.lowagie.text.DocListener; -import com.third.v2.lowagie.text.Image; +package com.fr.third.v2.lowagie.text.html.simpleparser; +import com.fr.third.v2.lowagie.text.DocListener; +import com.fr.third.v2.lowagie.text.Image; import java.util.HashMap; public interface ImageProvider { diff --git a/fine-itext/src/com/third/v2/lowagie/text/html/simpleparser/Img.java b/fine-itext/src/com/fr/third/v2/lowagie/text/html/simpleparser/Img.java similarity index 94% rename from fine-itext/src/com/third/v2/lowagie/text/html/simpleparser/Img.java rename to fine-itext/src/com/fr/third/v2/lowagie/text/html/simpleparser/Img.java index bb19014af..bfd356523 100644 --- a/fine-itext/src/com/third/v2/lowagie/text/html/simpleparser/Img.java +++ b/fine-itext/src/com/fr/third/v2/lowagie/text/html/simpleparser/Img.java @@ -45,12 +45,12 @@ * http://www.lowagie.com/iText/ */ -package com.third.v2.lowagie.text.html.simpleparser; +package com.fr.third.v2.lowagie.text.html.simpleparser; import java.util.HashMap; -import com.third.v2.lowagie.text.DocListener; -import com.third.v2.lowagie.text.Image; +import com.fr.third.v2.lowagie.text.DocListener; +import com.fr.third.v2.lowagie.text.Image; /** * diff --git a/fine-itext/src/com/third/v2/lowagie/text/html/simpleparser/IncCell.java b/fine-itext/src/com/fr/third/v2/lowagie/text/html/simpleparser/IncCell.java similarity index 93% rename from fine-itext/src/com/third/v2/lowagie/text/html/simpleparser/IncCell.java rename to fine-itext/src/com/fr/third/v2/lowagie/text/html/simpleparser/IncCell.java index 9bff921ce..1aff5f756 100644 --- a/fine-itext/src/com/third/v2/lowagie/text/html/simpleparser/IncCell.java +++ b/fine-itext/src/com/fr/third/v2/lowagie/text/html/simpleparser/IncCell.java @@ -45,16 +45,16 @@ * http://www.lowagie.com/iText/ */ -package com.third.v2.lowagie.text.html.simpleparser; +package com.fr.third.v2.lowagie.text.html.simpleparser; import java.util.ArrayList; -import com.third.v2.lowagie.text.Element; -import com.third.v2.lowagie.text.ElementListener; -import com.third.v2.lowagie.text.Phrase; -import com.third.v2.lowagie.text.TextElementArray; -import com.third.v2.lowagie.text.html.Markup; -import com.third.v2.lowagie.text.pdf.PdfPCell; +import com.fr.third.v2.lowagie.text.Element; +import com.fr.third.v2.lowagie.text.ElementListener; +import com.fr.third.v2.lowagie.text.TextElementArray; +import com.fr.third.v2.lowagie.text.html.Markup; +import com.fr.third.v2.lowagie.text.pdf.PdfPCell; +import com.fr.third.v2.lowagie.text.Phrase; /** * diff --git a/fine-itext/src/com/third/v2/lowagie/text/html/simpleparser/IncTable.java b/fine-itext/src/com/fr/third/v2/lowagie/text/html/simpleparser/IncTable.java similarity index 96% rename from fine-itext/src/com/third/v2/lowagie/text/html/simpleparser/IncTable.java rename to fine-itext/src/com/fr/third/v2/lowagie/text/html/simpleparser/IncTable.java index 2a2c347cd..8ddf9abbd 100644 --- a/fine-itext/src/com/third/v2/lowagie/text/html/simpleparser/IncTable.java +++ b/fine-itext/src/com/fr/third/v2/lowagie/text/html/simpleparser/IncTable.java @@ -45,14 +45,14 @@ * http://www.lowagie.com/iText/ */ -package com.third.v2.lowagie.text.html.simpleparser; +package com.fr.third.v2.lowagie.text.html.simpleparser; import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; -import com.third.v2.lowagie.text.pdf.PdfPCell; -import com.third.v2.lowagie.text.pdf.PdfPTable; +import com.fr.third.v2.lowagie.text.pdf.PdfPTable; +import com.fr.third.v2.lowagie.text.pdf.PdfPCell; /** * diff --git a/fine-itext/src/com/third/v2/lowagie/text/html/simpleparser/StyleSheet.java b/fine-itext/src/com/fr/third/v2/lowagie/text/html/simpleparser/StyleSheet.java similarity index 97% rename from fine-itext/src/com/third/v2/lowagie/text/html/simpleparser/StyleSheet.java rename to fine-itext/src/com/fr/third/v2/lowagie/text/html/simpleparser/StyleSheet.java index 8d9a07b31..b655dfcbf 100644 --- a/fine-itext/src/com/third/v2/lowagie/text/html/simpleparser/StyleSheet.java +++ b/fine-itext/src/com/fr/third/v2/lowagie/text/html/simpleparser/StyleSheet.java @@ -48,10 +48,9 @@ * http://www.lowagie.com/iText/ */ -package com.third.v2.lowagie.text.html.simpleparser; - -import com.third.v2.lowagie.text.html.Markup; +package com.fr.third.v2.lowagie.text.html.simpleparser; +import com.fr.third.v2.lowagie.text.html.Markup; import java.util.HashMap; public class StyleSheet { diff --git a/fine-itext/src/com/third/v2/lowagie/text/lgpl.txt b/fine-itext/src/com/fr/third/v2/lowagie/text/lgpl.txt similarity index 100% rename from fine-itext/src/com/third/v2/lowagie/text/lgpl.txt rename to fine-itext/src/com/fr/third/v2/lowagie/text/lgpl.txt diff --git a/fine-itext/src/com/third/v2/lowagie/text/misc_licenses.txt b/fine-itext/src/com/fr/third/v2/lowagie/text/misc_licenses.txt similarity index 100% rename from fine-itext/src/com/third/v2/lowagie/text/misc_licenses.txt rename to fine-itext/src/com/fr/third/v2/lowagie/text/misc_licenses.txt diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/AcroFields.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/AcroFields.java similarity index 99% rename from fine-itext/src/com/third/v2/lowagie/text/pdf/AcroFields.java rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/AcroFields.java index 753cc4998..5b280a7bc 100644 --- a/fine-itext/src/com/third/v2/lowagie/text/pdf/AcroFields.java +++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/AcroFields.java @@ -44,7 +44,7 @@ * you aren't using an obsolete version: * http://www.lowagie.com/iText/ */ -package com.third.v2.lowagie.text.pdf; +package com.fr.third.v2.lowagie.text.pdf; import java.awt.Color; import java.io.IOException; @@ -57,14 +57,15 @@ import java.util.Iterator; import java.util.List; import java.util.Map; -import com.third.v2.lowagie.text.DocumentException; -import com.third.v2.lowagie.text.Element; -import com.third.v2.lowagie.text.ExceptionConverter; -import com.third.v2.lowagie.text.Image; -import com.third.v2.lowagie.text.Rectangle; -import com.third.v2.lowagie.text.pdf.codec.Base64; +import com.fr.third.v2.lowagie.text.DocumentException; +import com.fr.third.v2.lowagie.text.Element; +import com.fr.third.v2.lowagie.text.ExceptionConverter; import org.w3c.dom.Node; +import com.fr.third.v2.lowagie.text.Image; +import com.fr.third.v2.lowagie.text.Rectangle; +import com.fr.third.v2.lowagie.text.pdf.codec.Base64; + /** * Query and change fields in existing documents either by method * calls or by FDF merging. diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/ArabicLigaturizer.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/ArabicLigaturizer.java similarity index 99% rename from fine-itext/src/com/third/v2/lowagie/text/pdf/ArabicLigaturizer.java rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/ArabicLigaturizer.java index 09704dc9d..b9eebfaac 100644 --- a/fine-itext/src/com/third/v2/lowagie/text/pdf/ArabicLigaturizer.java +++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/ArabicLigaturizer.java @@ -44,7 +44,7 @@ * you aren't using an obsolete version: * http://www.lowagie.com/iText/ */ -package com.third.v2.lowagie.text.pdf; +package com.fr.third.v2.lowagie.text.pdf; /** * Shape arabic characters. This code was inspired by an LGPL'ed C library: diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/AsianFontMapper.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/AsianFontMapper.java similarity index 99% rename from fine-itext/src/com/third/v2/lowagie/text/pdf/AsianFontMapper.java rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/AsianFontMapper.java index 8d6acc374..1e5c08948 100644 --- a/fine-itext/src/com/third/v2/lowagie/text/pdf/AsianFontMapper.java +++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/AsianFontMapper.java @@ -44,7 +44,7 @@ * you aren't using an obsolete version: * http://www.lowagie.com/iText/ */ -package com.third.v2.lowagie.text.pdf; +package com.fr.third.v2.lowagie.text.pdf; import java.awt.Font; diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/BadPdfFormatException.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/BadPdfFormatException.java similarity index 98% rename from fine-itext/src/com/third/v2/lowagie/text/pdf/BadPdfFormatException.java rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/BadPdfFormatException.java index 5e5f36694..fd305db3a 100644 --- a/fine-itext/src/com/third/v2/lowagie/text/pdf/BadPdfFormatException.java +++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/BadPdfFormatException.java @@ -47,7 +47,7 @@ * http://www.lowagie.com/iText/ */ -package com.third.v2.lowagie.text.pdf; +package com.fr.third.v2.lowagie.text.pdf; /** * Signals that a bad PDF format has been used to construct a PdfObject. diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/Barcode.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/Barcode.java similarity index 98% rename from fine-itext/src/com/third/v2/lowagie/text/pdf/Barcode.java rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/Barcode.java index 20484a752..8c14bc82b 100644 --- a/fine-itext/src/com/third/v2/lowagie/text/pdf/Barcode.java +++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/Barcode.java @@ -46,14 +46,13 @@ * you aren't using an obsolete version: * http://www.lowagie.com/iText/ */ -package com.third.v2.lowagie.text.pdf; +package com.fr.third.v2.lowagie.text.pdf; import java.awt.Color; -import com.third.v2.lowagie.text.ExceptionConverter; -import com.third.v2.lowagie.text.Image; -import com.third.v2.lowagie.text.Rectangle; - +import com.fr.third.v2.lowagie.text.ExceptionConverter; +import com.fr.third.v2.lowagie.text.Image; +import com.fr.third.v2.lowagie.text.Rectangle; /** Base class containing properties and methods common to all * barcode types. * diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/Barcode128.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/Barcode128.java similarity index 99% rename from fine-itext/src/com/third/v2/lowagie/text/pdf/Barcode128.java rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/Barcode128.java index 0ff2e7351..769c120c8 100644 --- a/fine-itext/src/com/third/v2/lowagie/text/pdf/Barcode128.java +++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/Barcode128.java @@ -46,15 +46,15 @@ * you aren't using an obsolete version: * http://www.lowagie.com/iText/ */ -package com.third.v2.lowagie.text.pdf; +package com.fr.third.v2.lowagie.text.pdf; import java.awt.Canvas; import java.awt.Color; import java.awt.Image; import java.awt.image.MemoryImageSource; -import com.third.v2.lowagie.text.Element; -import com.third.v2.lowagie.text.ExceptionConverter; -import com.third.v2.lowagie.text.Rectangle; +import com.fr.third.v2.lowagie.text.Element; +import com.fr.third.v2.lowagie.text.ExceptionConverter; +import com.fr.third.v2.lowagie.text.Rectangle; /** * Implements the code 128 and UCC/EAN-128. Other symbologies are allowed in raw mode.

@@ -732,7 +732,7 @@ public class Barcode128 extends Barcode{ * @param code the code to generate */ public void setCode(String code) { - if (getCodeType() == CODE128_UCC && code.startsWith("(")) { + if (getCodeType() == Barcode128.CODE128_UCC && code.startsWith("(")) { int idx = 0; String ret = ""; while (idx >= 0) { diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/Barcode39.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/Barcode39.java similarity index 98% rename from fine-itext/src/com/third/v2/lowagie/text/pdf/Barcode39.java rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/Barcode39.java index 5b727f776..bf3da7aa4 100644 --- a/fine-itext/src/com/third/v2/lowagie/text/pdf/Barcode39.java +++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/Barcode39.java @@ -46,16 +46,16 @@ * you aren't using an obsolete version: * http://www.lowagie.com/iText/ */ -package com.third.v2.lowagie.text.pdf; +package com.fr.third.v2.lowagie.text.pdf; import java.awt.Canvas; import java.awt.Color; import java.awt.Image; import java.awt.image.MemoryImageSource; -import com.third.v2.lowagie.text.Element; -import com.third.v2.lowagie.text.ExceptionConverter; -import com.third.v2.lowagie.text.Rectangle; +import com.fr.third.v2.lowagie.text.ExceptionConverter; +import com.fr.third.v2.lowagie.text.Element; +import com.fr.third.v2.lowagie.text.Rectangle; /** Implements the code 39 and code 39 extended. The default parameters are: * 

diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/BarcodeCodabar.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/BarcodeCodabar.java
similarity index 98%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/BarcodeCodabar.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/BarcodeCodabar.java
index 50f05cb01..fef6014b7 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/BarcodeCodabar.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/BarcodeCodabar.java
@@ -46,16 +46,16 @@
  * you aren't using an obsolete version:
  * http://www.lowagie.com/iText/
  */
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
 import java.awt.Canvas;
 import java.awt.Color;
 import java.awt.Image;
 import java.awt.image.MemoryImageSource;
 
-import com.third.v2.lowagie.text.Element;
-import com.third.v2.lowagie.text.ExceptionConverter;
-import com.third.v2.lowagie.text.Rectangle;
+import com.fr.third.v2.lowagie.text.ExceptionConverter;
+import com.fr.third.v2.lowagie.text.Element;
+import com.fr.third.v2.lowagie.text.Rectangle;
 
 /** Implements the code codabar. The default parameters are:
  * 
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/BarcodeDatamatrix.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/BarcodeDatamatrix.java
similarity index 99%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/BarcodeDatamatrix.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/BarcodeDatamatrix.java
index 423617a82..a8d9abfe9 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/BarcodeDatamatrix.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/BarcodeDatamatrix.java
@@ -46,11 +46,11 @@
  * you aren't using an obsolete version:
  * http://www.lowagie.com/iText/
  */
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
-import com.third.v2.lowagie.text.BadElementException;
-import com.third.v2.lowagie.text.Image;
-import com.third.v2.lowagie.text.pdf.codec.CCITTG4Encoder;
+import com.fr.third.v2.lowagie.text.BadElementException;
+import com.fr.third.v2.lowagie.text.Image;
+import com.fr.third.v2.lowagie.text.pdf.codec.CCITTG4Encoder;
 
 import java.awt.Canvas;
 import java.awt.Color;
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/BarcodeEAN.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/BarcodeEAN.java
similarity index 99%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/BarcodeEAN.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/BarcodeEAN.java
index 5a6f99c1d..d3db39cb9 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/BarcodeEAN.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/BarcodeEAN.java
@@ -44,7 +44,7 @@
  * you aren't using an obsolete version:
  * http://www.lowagie.com/iText/
  */
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
 import java.awt.Canvas;
 import java.awt.Color;
@@ -52,8 +52,8 @@ import java.awt.Image;
 import java.awt.image.MemoryImageSource;
 import java.util.Arrays;
 
-import com.third.v2.lowagie.text.ExceptionConverter;
-import com.third.v2.lowagie.text.Rectangle;
+import com.fr.third.v2.lowagie.text.ExceptionConverter;
+import com.fr.third.v2.lowagie.text.Rectangle;
 
 /** Generates barcodes in several formats: EAN13, EAN8, UPCA, UPCE,
  * supplemental 2 and 5. The default parameters are:
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/BarcodeEANSUPP.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/BarcodeEANSUPP.java
similarity index 98%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/BarcodeEANSUPP.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/BarcodeEANSUPP.java
index 81e8bea7a..a510275d2 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/BarcodeEANSUPP.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/BarcodeEANSUPP.java
@@ -44,10 +44,10 @@
  * you aren't using an obsolete version:
  * http://www.lowagie.com/iText/
  */
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 import java.awt.Color;
 
-import com.third.v2.lowagie.text.Rectangle;
+import com.fr.third.v2.lowagie.text.Rectangle;
 
 /** This class takes 2 barcodes, an EAN/UPC and a supplemental
  * and creates a single barcode with both combined in the
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/BarcodeInter25.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/BarcodeInter25.java
similarity index 98%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/BarcodeInter25.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/BarcodeInter25.java
index 1445a93e5..fcac54a0d 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/BarcodeInter25.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/BarcodeInter25.java
@@ -46,16 +46,16 @@
  * you aren't using an obsolete version:
  * http://www.lowagie.com/iText/
  */
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
 import java.awt.Canvas;
 import java.awt.Color;
 import java.awt.Image;
 import java.awt.image.MemoryImageSource;
 
-import com.third.v2.lowagie.text.Element;
-import com.third.v2.lowagie.text.ExceptionConverter;
-import com.third.v2.lowagie.text.Rectangle;
+import com.fr.third.v2.lowagie.text.ExceptionConverter;
+import com.fr.third.v2.lowagie.text.Element;
+import com.fr.third.v2.lowagie.text.Rectangle;
 
 /** Implements the code interleaved 2 of 5. The text can include
  * non numeric characters that are printed but do not generate bars.
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/BarcodePDF417.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/BarcodePDF417.java
similarity index 99%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/BarcodePDF417.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/BarcodePDF417.java
index c0638e3b2..9cd5573e0 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/BarcodePDF417.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/BarcodePDF417.java
@@ -46,16 +46,16 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
 import java.awt.Canvas;
 import java.awt.Color;
 import java.awt.image.MemoryImageSource;
 import java.util.ArrayList;
 
-import com.third.v2.lowagie.text.BadElementException;
-import com.third.v2.lowagie.text.Image;
-import com.third.v2.lowagie.text.pdf.codec.CCITTG4Encoder;
+import com.fr.third.v2.lowagie.text.BadElementException;
+import com.fr.third.v2.lowagie.text.Image;
+import com.fr.third.v2.lowagie.text.pdf.codec.CCITTG4Encoder;
 
 /** Generates the 2D barcode PDF417. Supports dimensioning auto-sizing, fixed
  * and variable sizes, automatic and manual error levels, raw codeword input,
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/BarcodePostnet.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/BarcodePostnet.java
similarity index 98%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/BarcodePostnet.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/BarcodePostnet.java
index 554d77c5a..c2c85a877 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/BarcodePostnet.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/BarcodePostnet.java
@@ -44,13 +44,13 @@
  * you aren't using an obsolete version:
  * http://www.lowagie.com/iText/
  */
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 import java.awt.Canvas;
 import java.awt.Color;
 import java.awt.Image;
 import java.awt.image.MemoryImageSource;
 
-import com.third.v2.lowagie.text.Rectangle;
+import com.fr.third.v2.lowagie.text.Rectangle;
 
 /** Implements the Postnet and Planet barcodes. The default parameters are:
  * 
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/BaseField.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/BaseField.java
similarity index 99%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/BaseField.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/BaseField.java
index d5984d6a2..dbc9614d5 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/BaseField.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/BaseField.java
@@ -45,7 +45,7 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
 import java.awt.Color;
 import java.io.IOException;
@@ -53,9 +53,9 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
 
-import com.third.v2.lowagie.text.DocumentException;
-import com.third.v2.lowagie.text.Element;
-import com.third.v2.lowagie.text.Rectangle;
+import com.fr.third.v2.lowagie.text.DocumentException;
+import com.fr.third.v2.lowagie.text.Element;
+import com.fr.third.v2.lowagie.text.Rectangle;
 
 /** Common field variables.
  * @author Paulo Soares (psoares@consiste.pt)
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/BaseFont.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/BaseFont.java
similarity index 99%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/BaseFont.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/BaseFont.java
index da952fcce..9a09aa099 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/BaseFont.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/BaseFont.java
@@ -47,7 +47,7 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -56,7 +56,7 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.StringTokenizer;
 
-import com.third.v2.lowagie.text.DocumentException;
+import com.fr.third.v2.lowagie.text.DocumentException;
 
 /**
  * Base class for the several font types supported
@@ -234,7 +234,7 @@ public abstract class BaseFont {
     public static final boolean NOT_CACHED = false;
     
     /** The path to the font resources. */    
-    public static final String RESOURCE_PATH = "com/third/v2/text/pdf/fonts/";
+    public static final String RESOURCE_PATH = "com/fr/third/v2/text/pdf/fonts/";
     /** The fake CID code that represents a newline. */    
     public static final char CID_NEWLINE = '\u7fff';
     
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/BidiLine.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/BidiLine.java
similarity index 99%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/BidiLine.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/BidiLine.java
index f4ff659bc..e90fe9c53 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/BidiLine.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/BidiLine.java
@@ -46,12 +46,12 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
 import java.util.ArrayList;
 
-import com.third.v2.lowagie.text.Chunk;
-import com.third.v2.lowagie.text.Utilities;
+import com.fr.third.v2.lowagie.text.Chunk;
+import com.fr.third.v2.lowagie.text.Utilities;
 
 /** Does all the line bidirectional processing with PdfChunk assembly.
  *
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/BidiOrder.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/BidiOrder.java
similarity index 99%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/BidiOrder.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/BidiOrder.java
index 16f86e2a9..3e76d8ea2 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/BidiOrder.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/BidiOrder.java
@@ -1,4 +1,4 @@
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
 /*
  * Copyright 2003 Paulo Soares
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/ByteBuffer.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/ByteBuffer.java
similarity index 99%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/ByteBuffer.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/ByteBuffer.java
index aa9ecca70..6ce86badd 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/ByteBuffer.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/ByteBuffer.java
@@ -47,7 +47,7 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.io.UnsupportedEncodingException;
@@ -55,7 +55,7 @@ import java.text.DecimalFormat;
 import java.text.DecimalFormatSymbols;
 import java.util.Locale;
 
-import com.third.v2.lowagie.text.DocWriter;
+import com.fr.third.v2.lowagie.text.DocWriter;
 
 /**
  * Acts like a StringBuffer but works with byte arrays.
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/CFFFont.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/CFFFont.java
similarity index 99%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/CFFFont.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/CFFFont.java
index b6c9a9608..a2ab197c3 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/CFFFont.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/CFFFont.java
@@ -66,12 +66,12 @@
  * future time.
  */
 
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
 import java.util.Iterator;
 import java.util.LinkedList;
 
-import com.third.v2.lowagie.text.ExceptionConverter;
+import com.fr.third.v2.lowagie.text.ExceptionConverter;
 
 public class CFFFont {
     
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/CFFFontSubset.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/CFFFontSubset.java
similarity index 99%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/CFFFontSubset.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/CFFFontSubset.java
index a4d8c4385..ae82e93cd 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/CFFFontSubset.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/CFFFontSubset.java
@@ -46,7 +46,7 @@
  * you aren't using an obsolete version:
  * http://www.lowagie.com/iText/
  */
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
 import java.io.IOException;
 import java.util.ArrayList;
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/CJKFont.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/CJKFont.java
similarity index 99%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/CJKFont.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/CJKFont.java
index 3f9393b5d..44b707d29 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/CJKFont.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/CJKFont.java
@@ -47,7 +47,7 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -57,7 +57,7 @@ import java.util.Hashtable;
 import java.util.Properties;
 import java.util.StringTokenizer;
 
-import com.third.v2.lowagie.text.DocumentException;
+import com.fr.third.v2.lowagie.text.DocumentException;
 
 /**
  * Creates a CJK font compatible with the fonts in the Adobe Asian font Pack.
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/CMYKColor.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/CMYKColor.java
similarity index 99%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/CMYKColor.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/CMYKColor.java
index 720baa6c7..f82b18044 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/CMYKColor.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/CMYKColor.java
@@ -47,7 +47,7 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
 /**
  *
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/CMapAwareDocumentFont.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/CMapAwareDocumentFont.java
similarity index 98%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/CMapAwareDocumentFont.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/CMapAwareDocumentFont.java
index 29da192cc..1ce9e37a6 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/CMapAwareDocumentFont.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/CMapAwareDocumentFont.java
@@ -44,13 +44,13 @@
  * you aren't using an obsolete version:
  * http://www.lowagie.com/iText/
  */
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 
-import com.third.v2.lowagie.text.pdf.fonts.cmaps.CMap;
-import com.third.v2.lowagie.text.pdf.fonts.cmaps.CMapParser;
+import com.fr.third.v2.lowagie.text.pdf.fonts.cmaps.CMapParser;
+import com.fr.third.v2.lowagie.text.pdf.fonts.cmaps.CMap;
 
 
 /**
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/ColorDetails.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/ColorDetails.java
similarity index 98%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/ColorDetails.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/ColorDetails.java
index da6ed5771..c3fad5511 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/ColorDetails.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/ColorDetails.java
@@ -47,7 +47,7 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
 /** Each spotcolor in the document will have an instance of this class
  *
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/ColumnText.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/ColumnText.java
similarity index 99%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/ColumnText.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/ColumnText.java
index 13f766dc9..4f3bde9c3 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/ColumnText.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/ColumnText.java
@@ -47,23 +47,23 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.Stack;
 
-import com.third.v2.lowagie.text.Chunk;
-import com.third.v2.lowagie.text.DocumentException;
-import com.third.v2.lowagie.text.Element;
-import com.third.v2.lowagie.text.ExceptionConverter;
-import com.third.v2.lowagie.text.Image;
-import com.third.v2.lowagie.text.ListItem;
-import com.third.v2.lowagie.text.Paragraph;
-import com.third.v2.lowagie.text.Phrase;
-import com.third.v2.lowagie.text.SimpleTable;
-import com.third.v2.lowagie.text.pdf.draw.DrawInterface;
-import com.third.v2.lowagie.text.List;
+import com.fr.third.v2.lowagie.text.Chunk;
+import com.fr.third.v2.lowagie.text.DocumentException;
+import com.fr.third.v2.lowagie.text.Element;
+import com.fr.third.v2.lowagie.text.ExceptionConverter;
+import com.fr.third.v2.lowagie.text.List;
+import com.fr.third.v2.lowagie.text.SimpleTable;
+import com.fr.third.v2.lowagie.text.Image;
+import com.fr.third.v2.lowagie.text.ListItem;
+import com.fr.third.v2.lowagie.text.Paragraph;
+import com.fr.third.v2.lowagie.text.Phrase;
+import com.fr.third.v2.lowagie.text.pdf.draw.DrawInterface;
 
 /**
  * Formats text in a columnwise form. The text is bound
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/DefaultFontMapper.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/DefaultFontMapper.java
similarity index 99%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/DefaultFontMapper.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/DefaultFontMapper.java
index ebb6ce5c9..d2c83307d 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/DefaultFontMapper.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/DefaultFontMapper.java
@@ -44,13 +44,13 @@
  * you aren't using an obsolete version:
  * http://www.lowagie.com/iText/
  */
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
 import java.awt.Font;
 import java.io.File;
 import java.util.HashMap;
 
-import com.third.v2.lowagie.text.ExceptionConverter;
+import com.fr.third.v2.lowagie.text.ExceptionConverter;
 
 /** Default class to map awt fonts to BaseFont.
  * @author Paulo Soares (psoares@consiste.pt)
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/DefaultSplitCharacter.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/DefaultSplitCharacter.java
similarity index 97%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/DefaultSplitCharacter.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/DefaultSplitCharacter.java
index a0c5d88e0..68142f665 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/DefaultSplitCharacter.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/DefaultSplitCharacter.java
@@ -47,9 +47,9 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
-import com.third.v2.lowagie.text.SplitCharacter;
+import com.fr.third.v2.lowagie.text.SplitCharacter;
 
 /**
  * The default class that is used to determine whether or not a character
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/DocumentFont.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/DocumentFont.java
similarity index 98%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/DocumentFont.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/DocumentFont.java
index be7c848e5..75258db4b 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/DocumentFont.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/DocumentFont.java
@@ -44,13 +44,13 @@
  * you aren't using an obsolete version:
  * http://www.lowagie.com/iText/
  */
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
 import java.io.IOException;
 import java.util.HashMap;
 
-import com.third.v2.lowagie.text.DocumentException;
-import com.third.v2.lowagie.text.ExceptionConverter;
+import com.fr.third.v2.lowagie.text.DocumentException;
+import com.fr.third.v2.lowagie.text.ExceptionConverter;
 
 /**
  *
@@ -123,7 +123,7 @@ public class DocumentFont extends BaseFont {
                 if (fontName.startsWith(cjkNames[k])) {
                     fontName = cjkNames[k];
                     try {
-                        cjkMirror = BaseFont.createFont(fontName, cjkEncs[k], false);
+                        cjkMirror = createFont(fontName, cjkEncs[k], false);
                     }
                     catch (Exception e) {
                         throw new ExceptionConverter(e);
@@ -137,7 +137,7 @@ public class DocumentFont extends BaseFont {
                     try {
                         if (k > 3)
                             k -= 4;
-                        cjkMirror = BaseFont.createFont(cjkNames2[k], cjkEncs2[k], false);
+                        cjkMirror = createFont(cjkNames2[k], cjkEncs2[k], false);
                     }
                     catch (Exception e) {
                         throw new ExceptionConverter(e);
@@ -311,7 +311,7 @@ public class DocumentFont extends BaseFont {
         if (BuiltinFonts14.containsKey(fontName)) {
             BaseFont bf;
             try {
-                bf = BaseFont.createFont(fontName, WINANSI, false);
+                bf = createFont(fontName, WINANSI, false);
             }
             catch (Exception e) {
                 throw new ExceptionConverter(e);
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/EnumerateTTC.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/EnumerateTTC.java
similarity index 97%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/EnumerateTTC.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/EnumerateTTC.java
index 64b00c671..6b34f48b4 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/EnumerateTTC.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/EnumerateTTC.java
@@ -47,12 +47,12 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
 import java.io.IOException;
 import java.util.HashMap;
 
-import com.third.v2.lowagie.text.DocumentException;
+import com.fr.third.v2.lowagie.text.DocumentException;
 
 /** Enumerates all the fonts inside a True Type Collection.
  *
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/ExtendedColor.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/ExtendedColor.java
similarity index 99%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/ExtendedColor.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/ExtendedColor.java
index 7e799442f..4f3ee1c99 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/ExtendedColor.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/ExtendedColor.java
@@ -47,7 +47,7 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
 import java.awt.Color;
 /**
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/ExtraEncoding.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/ExtraEncoding.java
similarity index 98%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/ExtraEncoding.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/ExtraEncoding.java
index 79f68d70d..b438ab84a 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/ExtraEncoding.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/ExtraEncoding.java
@@ -45,7 +45,7 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
 /**
  * Classes implementing this interface can create custom encodings or
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/FdfReader.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/FdfReader.java
similarity index 99%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/FdfReader.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/FdfReader.java
index 980a4bec7..f37473b8d 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/FdfReader.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/FdfReader.java
@@ -44,7 +44,7 @@
  * you aren't using an obsolete version:
  * http://www.lowagie.com/iText/
  */
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/FdfWriter.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/FdfWriter.java
similarity index 99%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/FdfWriter.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/FdfWriter.java
index 5d9b6cd54..7022f3e6d 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/FdfWriter.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/FdfWriter.java
@@ -44,7 +44,7 @@
  * you aren't using an obsolete version:
  * http://www.lowagie.com/iText/
  */
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
 import java.io.IOException;
 import java.io.OutputStream;
@@ -54,7 +54,7 @@ import java.util.Iterator;
 import java.util.Map;
 import java.util.StringTokenizer;
 
-import com.third.v2.lowagie.text.DocWriter;
+import com.fr.third.v2.lowagie.text.DocWriter;
 
 /** Writes an FDF form.
  * @author Paulo Soares (psoares@consiste.pt)
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/FontDetails.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/FontDetails.java
similarity index 98%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/FontDetails.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/FontDetails.java
index 7244181bf..b9965e739 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/FontDetails.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/FontDetails.java
@@ -47,13 +47,13 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
 import java.io.UnsupportedEncodingException;
 import java.util.HashMap;
 
-import com.third.v2.lowagie.text.ExceptionConverter;
-import com.third.v2.lowagie.text.Utilities;
+import com.fr.third.v2.lowagie.text.ExceptionConverter;
+import com.fr.third.v2.lowagie.text.Utilities;
 
 /**
  * Each font in the document will have an instance of this class
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/FontMapper.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/FontMapper.java
similarity index 98%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/FontMapper.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/FontMapper.java
index 59e5138f4..d8ef3a871 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/FontMapper.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/FontMapper.java
@@ -45,7 +45,7 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
 import java.awt.Font;
 
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/FontSelector.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/FontSelector.java
similarity index 96%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/FontSelector.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/FontSelector.java
index 7318830f8..eb3bc75e8 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/FontSelector.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/FontSelector.java
@@ -44,14 +44,14 @@
  * you aren't using an obsolete version:
  * http://www.lowagie.com/iText/
  */
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
 import java.util.ArrayList;
 
-import com.third.v2.lowagie.text.Chunk;
-import com.third.v2.lowagie.text.Font;
-import com.third.v2.lowagie.text.Phrase;
-import com.third.v2.lowagie.text.Utilities;
+import com.fr.third.v2.lowagie.text.Font;
+import com.fr.third.v2.lowagie.text.Chunk;
+import com.fr.third.v2.lowagie.text.Phrase;
+import com.fr.third.v2.lowagie.text.Utilities;
 
 /** Selects the appropriate fonts that contain the glyphs needed to
  * render text correctly. The fonts are checked in order until the 
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/GlyphList.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/GlyphList.java
similarity index 97%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/GlyphList.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/GlyphList.java
index 048cd0f29..9c1b3e9b9 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/GlyphList.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/GlyphList.java
@@ -47,14 +47,14 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
 import java.io.ByteArrayOutputStream;
 import java.io.InputStream;
 import java.util.HashMap;
 import java.util.StringTokenizer;
 
-import com.third.v2.lowagie.text.pdf.fonts.FontsResourceAnchor;
+import com.fr.third.v2.lowagie.text.pdf.fonts.FontsResourceAnchor;
 
 public class GlyphList {
     private static HashMap unicode2names = new HashMap();
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/GrayColor.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/GrayColor.java
similarity index 98%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/GrayColor.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/GrayColor.java
index a3bb984f7..443e3a26b 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/GrayColor.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/GrayColor.java
@@ -47,7 +47,7 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
 /**
  *
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/HyphenationAuto.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/HyphenationAuto.java
similarity index 96%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/HyphenationAuto.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/HyphenationAuto.java
index 931b969bf..5b1c69956 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/HyphenationAuto.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/HyphenationAuto.java
@@ -45,10 +45,10 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
-import com.third.v2.lowagie.text.pdf.hyphenation.Hyphenation;
-import com.third.v2.lowagie.text.pdf.hyphenation.Hyphenator;
+import com.fr.third.v2.lowagie.text.pdf.hyphenation.Hyphenation;
+import com.fr.third.v2.lowagie.text.pdf.hyphenation.Hyphenator;
 
 /** Hyphenates words automatically accordingly to the language and country.
  * The hyphenator engine was taken from FOP and uses the TEX patterns. If a language
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/HyphenationEvent.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/HyphenationEvent.java
similarity index 98%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/HyphenationEvent.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/HyphenationEvent.java
index 8095812fe..d771d9c0f 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/HyphenationEvent.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/HyphenationEvent.java
@@ -45,7 +45,7 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
 /** Called by Chunk to hyphenate a word.
  *
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/IntHashtable.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/IntHashtable.java
similarity index 99%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/IntHashtable.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/IntHashtable.java
index 00ac12bfd..ae8573e1c 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/IntHashtable.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/IntHashtable.java
@@ -27,7 +27,7 @@
  * but rereleased by the original author under the ASF license (above).
  */
 
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
 import java.util.Arrays;
 import java.util.Iterator;
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/LZWDecoder.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/LZWDecoder.java
similarity index 98%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/LZWDecoder.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/LZWDecoder.java
index 7df4a1f1f..90566135f 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/LZWDecoder.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/LZWDecoder.java
@@ -43,11 +43,12 @@
  * use in the design, construction, operation or maintenance of any 
  * nuclear facility.
  */
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 import java.io.IOException;
 import java.io.OutputStream;
 
-import com.third.v2.lowagie.text.ExceptionConverter;
+import com.fr.third.v2.lowagie.text.ExceptionConverter;
+
 /**
  * A class for performing LZW decoding.
  *
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/MappedRandomAccessFile.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/MappedRandomAccessFile.java
similarity index 99%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/MappedRandomAccessFile.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/MappedRandomAccessFile.java
index 79bd16d82..91d543357 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/MappedRandomAccessFile.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/MappedRandomAccessFile.java
@@ -46,7 +46,7 @@
  * you aren't using an obsolete version:
  * http://www.lowagie.com/iText/
  */
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/MultiColumnText.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/MultiColumnText.java
similarity index 98%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/MultiColumnText.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/MultiColumnText.java
index 30fc78d57..150eb9e68 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/MultiColumnText.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/MultiColumnText.java
@@ -47,16 +47,16 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
 import java.util.ArrayList;
 
-import com.third.v2.lowagie.text.Chunk;
-import com.third.v2.lowagie.text.DocumentException;
-import com.third.v2.lowagie.text.Element;
-import com.third.v2.lowagie.text.ElementListener;
-import com.third.v2.lowagie.text.Phrase;
-import com.third.v2.lowagie.text.Rectangle;
+import com.fr.third.v2.lowagie.text.Chunk;
+import com.fr.third.v2.lowagie.text.DocumentException;
+import com.fr.third.v2.lowagie.text.Element;
+import com.fr.third.v2.lowagie.text.ElementListener;
+import com.fr.third.v2.lowagie.text.Rectangle;
+import com.fr.third.v2.lowagie.text.Phrase;
 
 /**
  * Formats content into one or more columns bounded by a
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/OcspClient.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/OcspClient.java
similarity index 98%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/OcspClient.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/OcspClient.java
index f1b880a5c..3918d837a 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/OcspClient.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/OcspClient.java
@@ -47,7 +47,7 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
 /**
  * Interface for the OCSP Client.
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/OcspClientBouncyCastle.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/OcspClientBouncyCastle.java
similarity index 98%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/OcspClientBouncyCastle.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/OcspClientBouncyCastle.java
index a4283b9a1..16e4a793f 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/OcspClientBouncyCastle.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/OcspClientBouncyCastle.java
@@ -47,9 +47,10 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
+
+import com.fr.third.v2.lowagie.text.ExceptionConverter;
 
-import com.third.v2.lowagie.text.ExceptionConverter;
 import java.io.BufferedOutputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
@@ -61,7 +62,6 @@ import java.net.URL;
 import java.security.Security;
 import java.security.cert.X509Certificate;
 import java.util.Vector;
-
 import org.bouncycastle.asn1.DEROctetString;
 import org.bouncycastle.asn1.ocsp.OCSPObjectIdentifiers;
 import org.bouncycastle.asn1.x509.X509Extension;
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/OutputStreamCounter.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/OutputStreamCounter.java
similarity index 99%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/OutputStreamCounter.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/OutputStreamCounter.java
index 1e7b16136..488ebc4a1 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/OutputStreamCounter.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/OutputStreamCounter.java
@@ -44,7 +44,7 @@
  * you aren't using an obsolete version:
  * http://www.lowagie.com/iText/
  */
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 import java.io.IOException;
 import java.io.OutputStream;
 
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/OutputStreamEncryption.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/OutputStreamEncryption.java
similarity index 96%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/OutputStreamEncryption.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/OutputStreamEncryption.java
index 2eb268bab..0a8765636 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/OutputStreamEncryption.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/OutputStreamEncryption.java
@@ -46,11 +46,11 @@
  * you aren't using an obsolete version:
  * http://www.lowagie.com/iText/
  */
-package com.third.v2.lowagie.text.pdf;
-import com.third.v2.lowagie.text.ExceptionConverter;
-import com.third.v2.lowagie.text.pdf.crypto.AESCipher;
-import com.third.v2.lowagie.text.pdf.crypto.IVGenerator;
-import com.third.v2.lowagie.text.pdf.crypto.ARCFOUREncryption;
+package com.fr.third.v2.lowagie.text.pdf;
+import com.fr.third.v2.lowagie.text.ExceptionConverter;
+import com.fr.third.v2.lowagie.text.pdf.crypto.AESCipher;
+import com.fr.third.v2.lowagie.text.pdf.crypto.ARCFOUREncryption;
+import com.fr.third.v2.lowagie.text.pdf.crypto.IVGenerator;
 
 import java.io.IOException;
 import java.io.OutputStream;
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/PRAcroForm.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PRAcroForm.java
similarity index 99%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/PRAcroForm.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PRAcroForm.java
index b5cdf358d..cd108e522 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/PRAcroForm.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PRAcroForm.java
@@ -49,7 +49,7 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/PRIndirectReference.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PRIndirectReference.java
similarity index 98%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/PRIndirectReference.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PRIndirectReference.java
index d9fd62e80..0cbc212cd 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/PRIndirectReference.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PRIndirectReference.java
@@ -47,7 +47,7 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 import java.io.IOException;
 import java.io.OutputStream;
 
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/PRStream.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PRStream.java
similarity index 98%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/PRStream.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PRStream.java
index 133bfdf9c..fe9f84ae2 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/PRStream.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PRStream.java
@@ -47,7 +47,7 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -55,8 +55,8 @@ import java.io.OutputStream;
 import java.util.zip.Deflater;
 import java.util.zip.DeflaterOutputStream;
 
-import com.third.v2.lowagie.text.Document;
-import com.third.v2.lowagie.text.ExceptionConverter;
+import com.fr.third.v2.lowagie.text.ExceptionConverter;
+import com.fr.third.v2.lowagie.text.Document;
 
 public class PRStream extends PdfStream {
     
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/PRTokeniser.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PRTokeniser.java
similarity index 99%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/PRTokeniser.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PRTokeniser.java
index 2854f3f3c..7e8f5f9ff 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/PRTokeniser.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PRTokeniser.java
@@ -47,7 +47,7 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
 import java.io.IOException;
 /**
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/PageResources.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PageResources.java
similarity index 99%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/PageResources.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PageResources.java
index dc74abcb3..f2b4b42fa 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/PageResources.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PageResources.java
@@ -46,7 +46,7 @@
  * you aren't using an obsolete version:
  * http://www.lowagie.com/iText/
  */
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
 import java.util.HashMap;
 import java.util.Iterator;
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/PatternColor.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PatternColor.java
similarity index 98%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/PatternColor.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PatternColor.java
index d234bbd17..5905117a6 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/PatternColor.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PatternColor.java
@@ -44,7 +44,7 @@
  * you aren't using an obsolete version:
  * http://www.lowagie.com/iText/
  */
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
 /** Represents a pattern. Can be used in high-level constructs (Paragraph, Cell, etc.).
  */
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfAcroForm.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfAcroForm.java
similarity index 99%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/PdfAcroForm.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfAcroForm.java
index b143c5264..f27b575c0 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfAcroForm.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfAcroForm.java
@@ -47,13 +47,13 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
 import java.util.HashMap;
 import java.util.Iterator;
 
-import com.third.v2.lowagie.text.ExceptionConverter;
-import com.third.v2.lowagie.text.Rectangle;
+import com.fr.third.v2.lowagie.text.ExceptionConverter;
+import com.fr.third.v2.lowagie.text.Rectangle;
 
 /**
  * Each PDF document can contain maximum 1 AcroForm.
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfAction.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfAction.java
similarity index 99%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/PdfAction.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfAction.java
index 37f03c418..694d1d906 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfAction.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfAction.java
@@ -47,13 +47,13 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
 import java.io.IOException;
 import java.net.URL;
 import java.util.ArrayList;
 
-import com.third.v2.lowagie.text.pdf.collection.PdfTargetDictionary;
+import com.fr.third.v2.lowagie.text.pdf.collection.PdfTargetDictionary;
 
 /**
  * A PdfAction defines an action that can be triggered from a PDF file.
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfAnnotation.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfAnnotation.java
similarity index 96%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/PdfAnnotation.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfAnnotation.java
index 85d30c4aa..099a41b7d 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfAnnotation.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfAnnotation.java
@@ -47,13 +47,14 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
 import java.awt.Color;
 import java.io.IOException;
 import java.util.HashMap;
 
-import com.third.v2.lowagie.text.Rectangle;
+import com.fr.third.v2.lowagie.text.Rectangle;
+
 /**
  * A PdfAnnotation is a note that is associated with a page.
  *
@@ -244,9 +245,9 @@ public class PdfAnnotation extends PdfDictionary {
         PdfAnnotation annot = new PdfAnnotation(writer, rect);
         annot.put(PdfName.SUBTYPE, PdfName.TEXT);
         if (title != null)
-            annot.put(PdfName.T, new PdfString(title, TEXT_UNICODE));
+            annot.put(PdfName.T, new PdfString(title, PdfObject.TEXT_UNICODE));
         if (contents != null)
-            annot.put(PdfName.CONTENTS, new PdfString(contents, TEXT_UNICODE));
+            annot.put(PdfName.CONTENTS, new PdfString(contents, PdfObject.TEXT_UNICODE));
         if (open)
             annot.put(PdfName.OPEN, PdfBoolean.PDFTRUE);
         if (icon != null) {
@@ -326,7 +327,7 @@ public class PdfAnnotation extends PdfDictionary {
     public static PdfAnnotation createFreeText(PdfWriter writer, Rectangle rect, String contents, PdfContentByte defaultAppearance) {
         PdfAnnotation annot = new PdfAnnotation(writer, rect);
         annot.put(PdfName.SUBTYPE, PdfName.FREETEXT);
-        annot.put(PdfName.CONTENTS, new PdfString(contents, TEXT_UNICODE));
+        annot.put(PdfName.CONTENTS, new PdfString(contents, PdfObject.TEXT_UNICODE));
         annot.setDefaultAppearanceString(defaultAppearance);
         return annot;
     }
@@ -345,7 +346,7 @@ public class PdfAnnotation extends PdfDictionary {
     public static PdfAnnotation createLine(PdfWriter writer, Rectangle rect, String contents, float x1, float y1, float x2, float y2) {
         PdfAnnotation annot = new PdfAnnotation(writer, rect);
         annot.put(PdfName.SUBTYPE, PdfName.LINE);
-        annot.put(PdfName.CONTENTS, new PdfString(contents, TEXT_UNICODE));
+        annot.put(PdfName.CONTENTS, new PdfString(contents, PdfObject.TEXT_UNICODE));
         PdfArray array = new PdfArray(new PdfNumber(x1));
         array.add(new PdfNumber(y1));
         array.add(new PdfNumber(x2));
@@ -368,7 +369,7 @@ public class PdfAnnotation extends PdfDictionary {
             annot.put(PdfName.SUBTYPE, PdfName.SQUARE);
         else
             annot.put(PdfName.SUBTYPE, PdfName.CIRCLE);
-        annot.put(PdfName.CONTENTS, new PdfString(contents, TEXT_UNICODE));
+        annot.put(PdfName.CONTENTS, new PdfString(contents, PdfObject.TEXT_UNICODE));
         return annot;
     }
 
@@ -387,7 +388,7 @@ public class PdfAnnotation extends PdfDictionary {
                 break;
         }
         annot.put(PdfName.SUBTYPE, name);
-        annot.put(PdfName.CONTENTS, new PdfString(contents, TEXT_UNICODE));
+        annot.put(PdfName.CONTENTS, new PdfString(contents, PdfObject.TEXT_UNICODE));
         PdfArray array = new PdfArray();
         for (int k = 0; k < quadPoints.length; ++k)
         	array.add(new PdfNumber(quadPoints[k]));
@@ -406,7 +407,7 @@ public class PdfAnnotation extends PdfDictionary {
     public static PdfAnnotation createStamp(PdfWriter writer, Rectangle rect, String contents, String name) {
         PdfAnnotation annot = new PdfAnnotation(writer, rect);
         annot.put(PdfName.SUBTYPE, PdfName.STAMP);
-        annot.put(PdfName.CONTENTS, new PdfString(contents, TEXT_UNICODE));
+        annot.put(PdfName.CONTENTS, new PdfString(contents, PdfObject.TEXT_UNICODE));
         annot.put(PdfName.NAME, new PdfName(name));
         return annot;
     }
@@ -414,7 +415,7 @@ public class PdfAnnotation extends PdfDictionary {
     public static PdfAnnotation createInk(PdfWriter writer, Rectangle rect, String contents, float inkList[][]) {
         PdfAnnotation annot = new PdfAnnotation(writer, rect);
         annot.put(PdfName.SUBTYPE, PdfName.INK);
-        annot.put(PdfName.CONTENTS, new PdfString(contents, TEXT_UNICODE));
+        annot.put(PdfName.CONTENTS, new PdfString(contents, PdfObject.TEXT_UNICODE));
         PdfArray outer = new PdfArray();
         for (int k = 0; k < inkList.length; ++k) {
             PdfArray inner = new PdfArray();
@@ -455,7 +456,7 @@ public class PdfAnnotation extends PdfDictionary {
         PdfAnnotation annot = new PdfAnnotation(writer, rect);
         annot.put(PdfName.SUBTYPE, PdfName.FILEATTACHMENT);
         if (contents != null)
-            annot.put(PdfName.CONTENTS, new PdfString(contents, TEXT_UNICODE));
+            annot.put(PdfName.CONTENTS, new PdfString(contents, PdfObject.TEXT_UNICODE));
         annot.put(PdfName.FS, fs.getReference());
         return annot;
     }
@@ -472,7 +473,7 @@ public class PdfAnnotation extends PdfDictionary {
         PdfAnnotation annot = new PdfAnnotation(writer, rect);
         annot.put(PdfName.SUBTYPE, PdfName.POPUP);
         if (contents != null)
-            annot.put(PdfName.CONTENTS, new PdfString(contents, TEXT_UNICODE));
+            annot.put(PdfName.CONTENTS, new PdfString(contents, PdfObject.TEXT_UNICODE));
         if (open)
             annot.put(PdfName.OPEN, PdfBoolean.PDFTRUE);
         return annot;
@@ -567,7 +568,7 @@ public class PdfAnnotation extends PdfDictionary {
             remove(PdfName.T);
             return;
         }
-        put(PdfName.T, new PdfString(title, TEXT_UNICODE));
+        put(PdfName.T, new PdfString(title, PdfObject.TEXT_UNICODE));
     }
 
     public void setPopup(PdfAnnotation popup) {
@@ -705,15 +706,15 @@ public class PdfAnnotation extends PdfDictionary {
     }
 
     public void setMKNormalCaption(String caption) {
-        getMK().put(PdfName.CA, new PdfString(caption, TEXT_UNICODE));
+        getMK().put(PdfName.CA, new PdfString(caption, PdfObject.TEXT_UNICODE));
     }
 
     public void setMKRolloverCaption(String caption) {
-        getMK().put(PdfName.RC, new PdfString(caption, TEXT_UNICODE));
+        getMK().put(PdfName.RC, new PdfString(caption, PdfObject.TEXT_UNICODE));
     }
 
     public void setMKAlternateCaption(String caption) {
-        getMK().put(PdfName.AC, new PdfString(caption, TEXT_UNICODE));
+        getMK().put(PdfName.AC, new PdfString(caption, PdfObject.TEXT_UNICODE));
     }
 
     public void setMKNormalIcon(PdfTemplate template) {
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfAppearance.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfAppearance.java
similarity index 98%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/PdfAppearance.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfAppearance.java
index ed8eb938c..25e2da3bc 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfAppearance.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfAppearance.java
@@ -45,10 +45,10 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 import java.util.HashMap;
 
-import com.third.v2.lowagie.text.Rectangle;
+import com.fr.third.v2.lowagie.text.Rectangle;
 
 /**
  * Implements the appearance stream to be used with form fields..
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfArray.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfArray.java
similarity index 99%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/PdfArray.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfArray.java
index e13345c95..d03c3560c 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfArray.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfArray.java
@@ -47,7 +47,7 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
 import java.io.IOException;
 import java.io.OutputStream;
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfBoolean.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfBoolean.java
similarity index 99%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/PdfBoolean.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfBoolean.java
index f05039f3b..e7af362cd 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfBoolean.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfBoolean.java
@@ -47,7 +47,7 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
 /**
  * PdfBoolean is the boolean object represented by the keywords true or false.
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfBorderArray.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfBorderArray.java
similarity index 98%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/PdfBorderArray.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfBorderArray.java
index a1d64c25c..ff6cfa7b1 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfBorderArray.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfBorderArray.java
@@ -47,7 +47,7 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
 /**
  * A PdfBorderArray defines the border of a PdfAnnotation.
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfBorderDictionary.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfBorderDictionary.java
similarity index 98%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/PdfBorderDictionary.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfBorderDictionary.java
index f9dd3867a..700d9eb73 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfBorderDictionary.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfBorderDictionary.java
@@ -47,7 +47,7 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
 /**
  * A PdfBorderDictionary define the appearance of a Border (Annotations).
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfCell.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfCell.java
similarity index 98%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/PdfCell.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfCell.java
index ae5600901..972c788ca 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfCell.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfCell.java
@@ -47,21 +47,21 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
 import java.util.ArrayList;
 import java.util.Iterator;
 
-import com.third.v2.lowagie.text.Anchor;
-import com.third.v2.lowagie.text.Cell;
-import com.third.v2.lowagie.text.Chunk;
-import com.third.v2.lowagie.text.Element;
-import com.third.v2.lowagie.text.Image;
-import com.third.v2.lowagie.text.List;
-import com.third.v2.lowagie.text.ListItem;
-import com.third.v2.lowagie.text.Paragraph;
-import com.third.v2.lowagie.text.Phrase;
-import com.third.v2.lowagie.text.Rectangle;
+import com.fr.third.v2.lowagie.text.Anchor;
+import com.fr.third.v2.lowagie.text.Cell;
+import com.fr.third.v2.lowagie.text.Chunk;
+import com.fr.third.v2.lowagie.text.Element;
+import com.fr.third.v2.lowagie.text.Image;
+import com.fr.third.v2.lowagie.text.List;
+import com.fr.third.v2.lowagie.text.ListItem;
+import com.fr.third.v2.lowagie.text.Paragraph;
+import com.fr.third.v2.lowagie.text.Phrase;
+import com.fr.third.v2.lowagie.text.Rectangle;
 
 /**
  * A PdfCell is the PDF translation of a Cell.
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfChunk.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfChunk.java
similarity index 99%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/PdfChunk.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfChunk.java
index 045fda941..0b09c28b1 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfChunk.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfChunk.java
@@ -47,18 +47,18 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
 import java.awt.Color;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 
-import com.third.v2.lowagie.text.Chunk;
-import com.third.v2.lowagie.text.Font;
-import com.third.v2.lowagie.text.Image;
-import com.third.v2.lowagie.text.SplitCharacter;
-import com.third.v2.lowagie.text.Utilities;
+import com.fr.third.v2.lowagie.text.Chunk;
+import com.fr.third.v2.lowagie.text.Font;
+import com.fr.third.v2.lowagie.text.SplitCharacter;
+import com.fr.third.v2.lowagie.text.Image;
+import com.fr.third.v2.lowagie.text.Utilities;
 
 /**
  * A PdfChunk is the PDF translation of a Chunk.
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfColor.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfColor.java
similarity index 98%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/PdfColor.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfColor.java
index 30a8be7b6..7f7f81f7c 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfColor.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfColor.java
@@ -47,7 +47,7 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 import java.awt.Color;
 /**
  * A PdfColor defines a Color (it's a PdfArray containing 3 values).
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfContentByte.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfContentByte.java
similarity index 99%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/PdfContentByte.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfContentByte.java
index 02ddc5c7d..c47d3f25c 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfContentByte.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfContentByte.java
@@ -47,7 +47,7 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 import java.awt.Color;
 import java.awt.geom.AffineTransform;
 import java.awt.print.PrinterJob;
@@ -55,16 +55,16 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
 
-import com.third.v2.lowagie.text.Annotation;
-import com.third.v2.lowagie.text.DocumentException;
-import com.third.v2.lowagie.text.Element;
-import com.third.v2.lowagie.text.ExceptionConverter;
-import com.third.v2.lowagie.text.Image;
-import com.third.v2.lowagie.text.ImgJBIG2;
-import com.third.v2.lowagie.text.Rectangle;
-import com.third.v2.lowagie.text.exceptions.IllegalPdfSyntaxException;
-import com.third.v2.lowagie.text.pdf.internal.PdfAnnotationsImp;
-import com.third.v2.lowagie.text.pdf.internal.PdfXConformanceImp;
+import com.fr.third.v2.lowagie.text.Annotation;
+import com.fr.third.v2.lowagie.text.ExceptionConverter;
+import com.fr.third.v2.lowagie.text.exceptions.IllegalPdfSyntaxException;
+import com.fr.third.v2.lowagie.text.DocumentException;
+import com.fr.third.v2.lowagie.text.Element;
+import com.fr.third.v2.lowagie.text.Image;
+import com.fr.third.v2.lowagie.text.ImgJBIG2;
+import com.fr.third.v2.lowagie.text.Rectangle;
+import com.fr.third.v2.lowagie.text.pdf.internal.PdfAnnotationsImp;
+import com.fr.third.v2.lowagie.text.pdf.internal.PdfXConformanceImp;
 
 /**
  * PdfContentByte is an object containing the user positioned
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfContentParser.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfContentParser.java
similarity index 99%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/PdfContentParser.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfContentParser.java
index de414be0c..6470ca6a9 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfContentParser.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfContentParser.java
@@ -47,7 +47,7 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
 import java.io.IOException;
 import java.util.ArrayList;
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfContents.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfContents.java
similarity index 97%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/PdfContents.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfContents.java
index 296a55205..9137251f0 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfContents.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfContents.java
@@ -47,16 +47,16 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
 import java.io.ByteArrayOutputStream;
 import java.io.OutputStream;
 import java.util.zip.Deflater;
 import java.util.zip.DeflaterOutputStream;
 
-import com.third.v2.lowagie.text.DocWriter;
-import com.third.v2.lowagie.text.Document;
-import com.third.v2.lowagie.text.Rectangle;
+import com.fr.third.v2.lowagie.text.DocWriter;
+import com.fr.third.v2.lowagie.text.Document;
+import com.fr.third.v2.lowagie.text.Rectangle;
 
 /**
  * PdfContents is a PdfStream containing the contents (text + graphics) of a PdfPage.
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfCopy.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfCopy.java
similarity index 99%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/PdfCopy.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfCopy.java
index 1ef70e662..0f79fad8d 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfCopy.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfCopy.java
@@ -46,18 +46,17 @@
  * you aren't using an obsolete version:
  * http://www.lowagie.com/iText/
  */
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
 import java.io.IOException;
 import java.io.OutputStream;
 import java.util.HashMap;
 import java.util.Iterator;
 
-import com.third.v2.lowagie.text.Document;
-import com.third.v2.lowagie.text.DocumentException;
-import com.third.v2.lowagie.text.ExceptionConverter;
-import com.third.v2.lowagie.text.Rectangle;
-
+import com.fr.third.v2.lowagie.text.ExceptionConverter;
+import com.fr.third.v2.lowagie.text.Document;
+import com.fr.third.v2.lowagie.text.DocumentException;
+import com.fr.third.v2.lowagie.text.Rectangle;
 import java.util.ArrayList;
 
 /**
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfCopyFields.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfCopyFields.java
similarity index 97%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/PdfCopyFields.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfCopyFields.java
index d6d56aabc..382ad33ba 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfCopyFields.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfCopyFields.java
@@ -44,17 +44,17 @@
  * you aren't using an obsolete version:
  * http://www.lowagie.com/iText/
  */
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
 import java.io.IOException;
 import java.io.OutputStream;
 import java.security.cert.Certificate;
 import java.util.List;
 
-import com.third.v2.lowagie.text.DocWriter;
-import com.third.v2.lowagie.text.DocumentException;
-import com.third.v2.lowagie.text.pdf.interfaces.PdfEncryptionSettings;
-import com.third.v2.lowagie.text.pdf.interfaces.PdfViewerPreferences;
+import com.fr.third.v2.lowagie.text.pdf.interfaces.PdfViewerPreferences;
+import com.fr.third.v2.lowagie.text.DocWriter;
+import com.fr.third.v2.lowagie.text.DocumentException;
+import com.fr.third.v2.lowagie.text.pdf.interfaces.PdfEncryptionSettings;
 
 /**
  * Concatenates PDF documents including form fields. The rules for the form field
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfCopyFieldsImp.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfCopyFieldsImp.java
similarity index 98%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/PdfCopyFieldsImp.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfCopyFieldsImp.java
index 30aa9c226..6ae937fc2 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfCopyFieldsImp.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfCopyFieldsImp.java
@@ -45,7 +45,7 @@
  * you aren't using an obsolete version:
  * http://www.lowagie.com/iText/
  */
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
 import java.io.IOException;
 import java.io.OutputStream;
@@ -56,10 +56,10 @@ import java.util.List;
 import java.util.Map;
 import java.util.StringTokenizer;
 
-import com.third.v2.lowagie.text.Document;
-import com.third.v2.lowagie.text.DocumentException;
-import com.third.v2.lowagie.text.ExceptionConverter;
-import com.third.v2.lowagie.text.exceptions.BadPasswordException;
+import com.fr.third.v2.lowagie.text.ExceptionConverter;
+import com.fr.third.v2.lowagie.text.Document;
+import com.fr.third.v2.lowagie.text.DocumentException;
+import com.fr.third.v2.lowagie.text.exceptions.BadPasswordException;
 
 /**
  *
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfCopyForms.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfCopyForms.java
similarity index 97%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/PdfCopyForms.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfCopyForms.java
index 3b5f4b4a8..c490deff1 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfCopyForms.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfCopyForms.java
@@ -47,17 +47,17 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
 import java.io.IOException;
 import java.io.OutputStream;
 import java.security.cert.Certificate;
 import java.util.List;
 
-import com.third.v2.lowagie.text.DocWriter;
-import com.third.v2.lowagie.text.DocumentException;
-import com.third.v2.lowagie.text.pdf.interfaces.PdfEncryptionSettings;
-import com.third.v2.lowagie.text.pdf.interfaces.PdfViewerPreferences;
+import com.fr.third.v2.lowagie.text.DocWriter;
+import com.fr.third.v2.lowagie.text.DocumentException;
+import com.fr.third.v2.lowagie.text.pdf.interfaces.PdfEncryptionSettings;
+import com.fr.third.v2.lowagie.text.pdf.interfaces.PdfViewerPreferences;
 
 /**
  * Allows you to add one (or more) existing PDF document(s) to
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfCopyFormsImp.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfCopyFormsImp.java
similarity index 97%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/PdfCopyFormsImp.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfCopyFormsImp.java
index 14b8588c7..96abfab24 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfCopyFormsImp.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfCopyFormsImp.java
@@ -47,9 +47,10 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
+
+import com.fr.third.v2.lowagie.text.DocumentException;
 
-import com.third.v2.lowagie.text.DocumentException;
 import java.io.OutputStream;
 import java.util.HashMap;
 
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfDashPattern.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfDashPattern.java
similarity index 99%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/PdfDashPattern.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfDashPattern.java
index 4c423405c..4019676bd 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfDashPattern.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfDashPattern.java
@@ -47,7 +47,7 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
 import java.io.IOException;
 import java.io.OutputStream;
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfDate.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfDate.java
similarity index 99%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/PdfDate.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfDate.java
index 84d1ab1f1..18c815027 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfDate.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfDate.java
@@ -47,7 +47,7 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
 import java.util.Calendar;
 import java.util.GregorianCalendar;
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfDestination.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfDestination.java
similarity index 99%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/PdfDestination.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfDestination.java
index cc22d8525..c0103fbaf 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfDestination.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfDestination.java
@@ -47,7 +47,7 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
 /**
  * A PdfColor defines a Color (it's a PdfArray containing 3 values).
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfDeveloperExtension.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfDeveloperExtension.java
similarity index 99%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/PdfDeveloperExtension.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfDeveloperExtension.java
index dbdd25076..4f75d15a0 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfDeveloperExtension.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfDeveloperExtension.java
@@ -47,7 +47,7 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
 /**
  * Beginning with BaseVersion 1.7, the extensions dictionary lets developers
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfDictionary.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfDictionary.java
similarity index 99%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/PdfDictionary.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfDictionary.java
index b5d46916a..f20f6e57e 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfDictionary.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfDictionary.java
@@ -47,7 +47,7 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
 import java.io.IOException;
 import java.io.OutputStream;
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfDocument.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfDocument.java
similarity index 98%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/PdfDocument.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfDocument.java
index 9509d47c8..e1c55c4e3 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfDocument.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfDocument.java
@@ -47,7 +47,7 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
 import java.awt.Color;
 import java.io.IOException;
@@ -59,35 +59,34 @@ import java.util.Map;
 import java.util.Set;
 import java.util.TreeMap;
 
-import com.third.v2.lowagie.text.Anchor;
-import com.third.v2.lowagie.text.Annotation;
-import com.third.v2.lowagie.text.BadElementException;
-import com.third.v2.lowagie.text.Chunk;
-import com.third.v2.lowagie.text.Document;
-import com.third.v2.lowagie.text.DocumentException;
-import com.third.v2.lowagie.text.Element;
-import com.third.v2.lowagie.text.ExceptionConverter;
-import com.third.v2.lowagie.text.Font;
-import com.third.v2.lowagie.text.HeaderFooter;
-import com.third.v2.lowagie.text.Image;
-import com.third.v2.lowagie.text.List;
-import com.third.v2.lowagie.text.ListItem;
-import com.third.v2.lowagie.text.MarkedObject;
-import com.third.v2.lowagie.text.MarkedSection;
-import com.third.v2.lowagie.text.Meta;
-import com.third.v2.lowagie.text.Paragraph;
-import com.third.v2.lowagie.text.Phrase;
-import com.third.v2.lowagie.text.Rectangle;
-import com.third.v2.lowagie.text.Section;
-import com.third.v2.lowagie.text.SimpleTable;
-import com.third.v2.lowagie.text.Table;
-import com.third.v2.lowagie.text.pdf.collection.PdfCollection;
-import com.third.v2.lowagie.text.pdf.draw.DrawInterface;
-import com.third.v2.lowagie.text.pdf.internal.PdfAnnotationsImp;
-import com.third.v2.lowagie.text.pdf.internal.PdfViewerPreferencesImp;
-import com.third.v2.lowagie.text.DocListener;
-import com.third.v2.lowagie.text.pdf.interfaces.PdfViewerPreferences;
-
+import com.fr.third.v2.lowagie.text.Annotation;
+import com.fr.third.v2.lowagie.text.DocListener;
+import com.fr.third.v2.lowagie.text.ExceptionConverter;
+import com.fr.third.v2.lowagie.text.pdf.interfaces.PdfViewerPreferences;
+import com.fr.third.v2.lowagie.text.Anchor;
+import com.fr.third.v2.lowagie.text.BadElementException;
+import com.fr.third.v2.lowagie.text.Chunk;
+import com.fr.third.v2.lowagie.text.Document;
+import com.fr.third.v2.lowagie.text.DocumentException;
+import com.fr.third.v2.lowagie.text.Element;
+import com.fr.third.v2.lowagie.text.Font;
+import com.fr.third.v2.lowagie.text.HeaderFooter;
+import com.fr.third.v2.lowagie.text.Image;
+import com.fr.third.v2.lowagie.text.List;
+import com.fr.third.v2.lowagie.text.ListItem;
+import com.fr.third.v2.lowagie.text.MarkedObject;
+import com.fr.third.v2.lowagie.text.MarkedSection;
+import com.fr.third.v2.lowagie.text.Meta;
+import com.fr.third.v2.lowagie.text.Paragraph;
+import com.fr.third.v2.lowagie.text.Phrase;
+import com.fr.third.v2.lowagie.text.Rectangle;
+import com.fr.third.v2.lowagie.text.Section;
+import com.fr.third.v2.lowagie.text.SimpleTable;
+import com.fr.third.v2.lowagie.text.Table;
+import com.fr.third.v2.lowagie.text.pdf.collection.PdfCollection;
+import com.fr.third.v2.lowagie.text.pdf.draw.DrawInterface;
+import com.fr.third.v2.lowagie.text.pdf.internal.PdfAnnotationsImp;
+import com.fr.third.v2.lowagie.text.pdf.internal.PdfViewerPreferencesImp;
 import java.text.DecimalFormat;
 
 /**
@@ -151,7 +150,7 @@ public class PdfDocument extends Document {
          */
 
         void addTitle(String title) {
-            put(PdfName.TITLE, new PdfString(title, PdfObject.TEXT_UNICODE));
+            put(PdfName.TITLE, new PdfString(title, TEXT_UNICODE));
         }
 
         /**
@@ -161,7 +160,7 @@ public class PdfDocument extends Document {
          */
 
         void addSubject(String subject) {
-            put(PdfName.SUBJECT, new PdfString(subject, PdfObject.TEXT_UNICODE));
+            put(PdfName.SUBJECT, new PdfString(subject, TEXT_UNICODE));
         }
 
         /**
@@ -171,7 +170,7 @@ public class PdfDocument extends Document {
          */
 
         void addKeywords(String keywords) {
-            put(PdfName.KEYWORDS, new PdfString(keywords, PdfObject.TEXT_UNICODE));
+            put(PdfName.KEYWORDS, new PdfString(keywords, TEXT_UNICODE));
         }
 
         /**
@@ -181,7 +180,7 @@ public class PdfDocument extends Document {
          */
 
         void addAuthor(String author) {
-            put(PdfName.AUTHOR, new PdfString(author, PdfObject.TEXT_UNICODE));
+            put(PdfName.AUTHOR, new PdfString(author, TEXT_UNICODE));
         }
 
         /**
@@ -191,7 +190,7 @@ public class PdfDocument extends Document {
          */
 
         void addCreator(String creator) {
-            put(PdfName.CREATOR, new PdfString(creator, PdfObject.TEXT_UNICODE));
+            put(PdfName.CREATOR, new PdfString(creator, TEXT_UNICODE));
         }
 
         /**
@@ -215,7 +214,7 @@ public class PdfDocument extends Document {
         void addkey(String key, String value) {
             if (key.equals("Producer") || key.equals("CreationDate"))
                 return;
-            put(new PdfName(key), new PdfString(value, PdfObject.TEXT_UNICODE));
+            put(new PdfName(key), new PdfString(value, TEXT_UNICODE));
         }
     }
 
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfEFStream.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfEFStream.java
similarity index 99%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/PdfEFStream.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfEFStream.java
index bb8dea4f7..8c62d2ae9 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfEFStream.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfEFStream.java
@@ -47,7 +47,7 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfEncodings.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfEncodings.java
similarity index 99%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/PdfEncodings.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfEncodings.java
index f61a34d35..dac81b301 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfEncodings.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfEncodings.java
@@ -45,7 +45,7 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
@@ -55,7 +55,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.StringTokenizer;
 
-import com.third.v2.lowagie.text.ExceptionConverter;
+import com.fr.third.v2.lowagie.text.ExceptionConverter;
 
 /** Supports fast encodings for winansi and PDFDocEncoding.
  * Supports conversions from CJK encodings to CID.
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfEncryption.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfEncryption.java
similarity index 99%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/PdfEncryption.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfEncryption.java
index 5d9994603..cc151e6ce 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfEncryption.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfEncryption.java
@@ -47,9 +47,10 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
-import com.third.v2.lowagie.text.pdf.crypto.ARCFOUREncryption;
+import com.fr.third.v2.lowagie.text.ExceptionConverter;
+import com.fr.third.v2.lowagie.text.pdf.crypto.ARCFOUREncryption;
 
 import java.io.IOException;
 import java.io.OutputStream;
@@ -57,8 +58,6 @@ import java.io.ByteArrayOutputStream;
 import java.security.MessageDigest;
 import java.security.cert.Certificate;
 
-import com.third.v2.lowagie.text.ExceptionConverter;
-
 /**
  * 
  * @author Paulo Soares (psoares@consiste.pt)
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfEncryptor.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfEncryptor.java
similarity index 99%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/PdfEncryptor.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfEncryptor.java
index 0f5e4d3fd..8328d9d11 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfEncryptor.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfEncryptor.java
@@ -46,13 +46,13 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
 import java.io.IOException;
 import java.io.OutputStream;
 import java.util.HashMap;
 
-import com.third.v2.lowagie.text.DocumentException;
+import com.fr.third.v2.lowagie.text.DocumentException;
 
 /** This class takes any PDF and returns exactly the same but
  * encrypted. All the content, links, outlines, etc, are kept.
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfException.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfException.java
similarity index 97%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/PdfException.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfException.java
index a37752e73..ed236295a 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfException.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfException.java
@@ -47,9 +47,9 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
-import com.third.v2.lowagie.text.DocumentException;
+import com.fr.third.v2.lowagie.text.DocumentException;
 
 /**
  * Signals that an unspecified problem while constructing a PDF document.
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfFileSpecification.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfFileSpecification.java
similarity index 97%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/PdfFileSpecification.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfFileSpecification.java
index 6c87b7ada..c20619b22 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfFileSpecification.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfFileSpecification.java
@@ -45,7 +45,7 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -53,7 +53,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
 
-import com.third.v2.lowagie.text.pdf.collection.PdfCollectionItem;
+import com.fr.third.v2.lowagie.text.pdf.collection.PdfCollectionItem;
 
 /** Specifies a file or an URL. The file can be extern or embedded.
  *
@@ -268,7 +268,7 @@ public class PdfFileSpecification extends PdfDictionary {
      * @param unicode	if true, the filename is UTF-16BE encoded; otherwise PDFDocEncoding is used;
      */    
     public void setUnicodeFileName(String filename, boolean unicode) {
-        put(PdfName.UF, new PdfString(filename, unicode ? PdfObject.TEXT_UNICODE : PdfObject.TEXT_PDFDOCENCODING));
+        put(PdfName.UF, new PdfString(filename, unicode ? TEXT_UNICODE : TEXT_PDFDOCENCODING));
     }
     
     /**
@@ -287,7 +287,7 @@ public class PdfFileSpecification extends PdfDictionary {
      * @param unicode		if true, the text is added as a unicode string
      */
     public void addDescription(String description, boolean unicode) {
-        put(PdfName.DESC, new PdfString(description, unicode ? PdfObject.TEXT_UNICODE : PdfObject.TEXT_PDFDOCENCODING));
+        put(PdfName.DESC, new PdfString(description, unicode ? TEXT_UNICODE : TEXT_PDFDOCENCODING));
     }
     
     /**
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfFont.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfFont.java
similarity index 97%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/PdfFont.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfFont.java
index cb36b64c9..571ae534a 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfFont.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfFont.java
@@ -47,10 +47,10 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
-import com.third.v2.lowagie.text.ExceptionConverter;
-import com.third.v2.lowagie.text.Image;
+import com.fr.third.v2.lowagie.text.ExceptionConverter;
+import com.fr.third.v2.lowagie.text.Image;
 
 /**
  * PdfFont is the Pdf Font object.
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfFormField.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfFormField.java
similarity index 95%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/PdfFormField.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfFormField.java
index cd8edfa23..4e613b664 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfFormField.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfFormField.java
@@ -45,11 +45,11 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 import java.util.ArrayList;
 import java.util.Iterator;
 
-import com.third.v2.lowagie.text.Rectangle;
+import com.fr.third.v2.lowagie.text.Rectangle;
 
 /** Implements form fields.
  *
@@ -196,7 +196,7 @@ public class PdfFormField extends PdfAnnotation {
     protected static PdfArray processOptions(String options[]) {
         PdfArray array = new PdfArray();
         for (int k = 0; k < options.length; ++k) {
-            array.add(new PdfString(options[k], PdfObject.TEXT_UNICODE));
+            array.add(new PdfString(options[k], TEXT_UNICODE));
         }
         return array;
     }
@@ -205,8 +205,8 @@ public class PdfFormField extends PdfAnnotation {
         PdfArray array = new PdfArray();
         for (int k = 0; k < options.length; ++k) {
             String subOption[] = options[k];
-            PdfArray ar2 = new PdfArray(new PdfString(subOption[0], PdfObject.TEXT_UNICODE));
-            ar2.add(new PdfString(subOption[1], PdfObject.TEXT_UNICODE));
+            PdfArray ar2 = new PdfArray(new PdfString(subOption[0], TEXT_UNICODE));
+            ar2.add(new PdfString(subOption[1], TEXT_UNICODE));
             array.add(ar2);
         }
         return array;
@@ -249,7 +249,7 @@ public class PdfFormField extends PdfAnnotation {
     }
     
     public void setValueAsString(String s) {
-        put(PdfName.V, new PdfString(s, PdfObject.TEXT_UNICODE));
+        put(PdfName.V, new PdfString(s, TEXT_UNICODE));
     }
 
     public void setValueAsName(String s) {
@@ -261,7 +261,7 @@ public class PdfFormField extends PdfAnnotation {
     }
 
     public void setDefaultValueAsString(String s) {
-        put(PdfName.DV, new PdfString(s, PdfObject.TEXT_UNICODE));
+        put(PdfName.DV, new PdfString(s, TEXT_UNICODE));
     }
 
     public void setDefaultValueAsName(String s) {
@@ -270,15 +270,15 @@ public class PdfFormField extends PdfAnnotation {
     
     public void setFieldName(String s) {
         if (s != null)
-            put(PdfName.T, new PdfString(s, PdfObject.TEXT_UNICODE));
+            put(PdfName.T, new PdfString(s, TEXT_UNICODE));
     }
     
     public void setUserName(String s) {
-        put(PdfName.TU, new PdfString(s, PdfObject.TEXT_UNICODE));
+        put(PdfName.TU, new PdfString(s, TEXT_UNICODE));
     }
     
     public void setMappingName(String s) {
-        put(PdfName.TM, new PdfString(s, PdfObject.TEXT_UNICODE));
+        put(PdfName.TM, new PdfString(s, TEXT_UNICODE));
     }
     
     public void setQuadding(int v) {
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfFormXObject.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfFormXObject.java
similarity index 98%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/PdfFormXObject.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfFormXObject.java
index 028099c59..b15121112 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfFormXObject.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfFormXObject.java
@@ -47,7 +47,7 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
 /**
  * PdfFormObject is a type of XObject containing a template-object.
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfFunction.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfFunction.java
similarity index 98%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/PdfFunction.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfFunction.java
index c4f3ad325..c6b747ca0 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfFunction.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfFunction.java
@@ -44,11 +44,11 @@
  * you aren't using an obsolete version:
  * http://www.lowagie.com/iText/
  */
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
 import java.io.IOException;
 
-import com.third.v2.lowagie.text.ExceptionConverter;
+import com.fr.third.v2.lowagie.text.ExceptionConverter;
 
 /** Implements PDF functions.
  *
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfGState.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfGState.java
similarity index 99%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/PdfGState.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfGState.java
index 631bb8b50..b442142ef 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfGState.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfGState.java
@@ -44,7 +44,7 @@
  * you aren't using an obsolete version:
  * http://www.lowagie.com/iText/
  */
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
 /** The graphic state dictionary.
  *
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfGraphics2D.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfGraphics2D.java
similarity index 98%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/PdfGraphics2D.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfGraphics2D.java
index 5245337de..c0642c44e 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfGraphics2D.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfGraphics2D.java
@@ -47,7 +47,7 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
 import java.awt.AlphaComposite;
 import java.awt.BasicStroke;
@@ -100,7 +100,7 @@ import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
 
-import com.third.v2.lowagie.text.pdf.internal.PolylineShape;
+import com.fr.third.v2.lowagie.text.pdf.internal.PolylineShape;
 
 import java.util.Locale;
 import javax.imageio.IIOImage;
@@ -1447,9 +1447,9 @@ public class PdfGraphics2D extends Graphics2D {
         }
         
         try {
-            com.third.v2.lowagie.text.Image image = null;
+            com.fr.third.v2.lowagie.text.Image image = null;
             if(!convertImagesToJPEG){
-                image = com.third.v2.lowagie.text.Image.getInstance(img, bgColor);
+                image = com.fr.third.v2.lowagie.text.Image.getInstance(img, bgColor);
             }
             else{
                 BufferedImage scaled = new BufferedImage(img.getWidth(null), img.getHeight(null), BufferedImage.TYPE_INT_RGB);
@@ -1470,11 +1470,11 @@ public class PdfGraphics2D extends Graphics2D {
 
                 scaled.flush();
                 scaled = null;
-                image = com.third.v2.lowagie.text.Image.getInstance(baos.toByteArray());
+                image = com.fr.third.v2.lowagie.text.Image.getInstance(baos.toByteArray());
                 
             }
             if (mask!=null) {
-                com.third.v2.lowagie.text.Image msk = com.third.v2.lowagie.text.Image.getInstance(mask, null, true);
+                com.fr.third.v2.lowagie.text.Image msk = com.fr.third.v2.lowagie.text.Image.getInstance(mask, null, true);
                 msk.makeMask();
                 msk.setInverted(true);
                 image.setImageMask(msk);
@@ -1566,7 +1566,7 @@ public class PdfGraphics2D extends Graphics2D {
                 TexturePaint tp = (TexturePaint)paint;
                 BufferedImage img = tp.getImage();
                 Rectangle2D rect = tp.getAnchorRect();
-                com.third.v2.lowagie.text.Image image = com.third.v2.lowagie.text.Image.getInstance(img, null);
+                com.fr.third.v2.lowagie.text.Image image = com.fr.third.v2.lowagie.text.Image.getInstance(img, null);
                 PdfPatternPainter pattern = cb.createPattern(image.getWidth(), image.getHeight());
                 AffineTransform inverse = this.normalizeMatrix();
                 inverse.translate(rect.getX(), rect.getY());
@@ -1610,7 +1610,7 @@ public class PdfGraphics2D extends Graphics2D {
                 }
                 g.dispose();
                 g = null;
-                com.third.v2.lowagie.text.Image image = com.third.v2.lowagie.text.Image.getInstance(img, null);
+                com.fr.third.v2.lowagie.text.Image image = com.fr.third.v2.lowagie.text.Image.getInstance(img, null);
                 PdfPatternPainter pattern = cb.createPattern(width, height);
                 image.setAbsolutePosition(0,0);
                 pattern.addImage(image);
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfICCBased.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfICCBased.java
similarity index 97%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/PdfICCBased.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfICCBased.java
index 1cc68e81f..761fdf9f5 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfICCBased.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfICCBased.java
@@ -44,11 +44,11 @@
  * you aren't using an obsolete version:
  * http://www.lowagie.com/iText/
  */
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
 import java.awt.color.ICC_Profile;
 
-import com.third.v2.lowagie.text.ExceptionConverter;
+import com.fr.third.v2.lowagie.text.ExceptionConverter;
 
 /**
  * A PdfICCBased defines a ColorSpace
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfImage.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfImage.java
similarity index 99%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/PdfImage.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfImage.java
index 1febf1d76..da508752e 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfImage.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfImage.java
@@ -47,14 +47,14 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 
-import com.third.v2.lowagie.text.Image;
+import com.fr.third.v2.lowagie.text.Image;
 
 /**
  * PdfImage is a PdfStream containing an image-Dictionary and -stream.
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfImportedPage.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfImportedPage.java
similarity index 96%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/PdfImportedPage.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfImportedPage.java
index 4d0ed6f53..fcb089b33 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfImportedPage.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfImportedPage.java
@@ -47,11 +47,11 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 import java.io.IOException;
 
-import com.third.v2.lowagie.text.DocumentException;
-import com.third.v2.lowagie.text.Image;
+import com.fr.third.v2.lowagie.text.DocumentException;
+import com.fr.third.v2.lowagie.text.Image;
 
 /** Represents an imported page.
  *
@@ -93,7 +93,7 @@ public class PdfImportedPage extends PdfTemplate {
      * @param d dummy
      * @param e dummy
      * @param f dummy
-     * @throws DocumentException  dummy */
+     * @throws DocumentException  dummy */    
     public void addImage(Image image, float a, float b, float c, float d, float e, float f) throws DocumentException {
         throwError();
     }
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfIndirectObject.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfIndirectObject.java
similarity index 98%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/PdfIndirectObject.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfIndirectObject.java
index 7da76b493..dc4cc32d2 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfIndirectObject.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfIndirectObject.java
@@ -48,12 +48,12 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
 import java.io.IOException;
 import java.io.OutputStream;
 
-import com.third.v2.lowagie.text.DocWriter;
+import com.fr.third.v2.lowagie.text.DocWriter;
 
 /**
  * PdfIndirectObject is the Pdf indirect object.
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfIndirectReference.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfIndirectReference.java
similarity index 99%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/PdfIndirectReference.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfIndirectReference.java
index 888bad2a8..d5c85f215 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfIndirectReference.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfIndirectReference.java
@@ -47,7 +47,7 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
 /**
  * PdfIndirectReference contains a reference to a PdfIndirectObject.
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfLayer.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfLayer.java
similarity index 97%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/PdfLayer.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfLayer.java
index 1bee2d82d..f90f0dcf0 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfLayer.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfLayer.java
@@ -45,7 +45,7 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
 import java.util.ArrayList;
 /**
@@ -158,7 +158,7 @@ public class PdfLayer extends PdfDictionary implements PdfOCG {
      * @param name the name of this layer
      */    
     public void setName(String name) {
-        put(PdfName.NAME, new PdfString(name, PdfObject.TEXT_UNICODE));
+        put(PdfName.NAME, new PdfString(name, TEXT_UNICODE));
     }
     
     /**
@@ -206,7 +206,7 @@ public class PdfLayer extends PdfDictionary implements PdfOCG {
     public void setCreatorInfo(String creator, String subtype) {
         PdfDictionary usage = getUsage();
         PdfDictionary dic = new PdfDictionary();
-        dic.put(PdfName.CREATOR, new PdfString(creator, PdfObject.TEXT_UNICODE));
+        dic.put(PdfName.CREATOR, new PdfString(creator, TEXT_UNICODE));
         dic.put(PdfName.SUBTYPE, new PdfName(subtype));
         usage.put(PdfName.CREATORINFO, dic);
     }
@@ -222,7 +222,7 @@ public class PdfLayer extends PdfDictionary implements PdfOCG {
     public void setLanguage(String lang, boolean preferred) {
         PdfDictionary usage = getUsage();
         PdfDictionary dic = new PdfDictionary();
-        dic.put(PdfName.LANG, new PdfString(lang, PdfObject.TEXT_UNICODE));
+        dic.put(PdfName.LANG, new PdfString(lang, TEXT_UNICODE));
         if (preferred)
             dic.put(PdfName.PREFERRED, PdfName.ON);
         usage.put(PdfName.LANGUAGE, dic);
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfLayerMembership.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfLayerMembership.java
similarity index 99%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/PdfLayerMembership.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfLayerMembership.java
index cd81dcd47..e3962ce04 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfLayerMembership.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfLayerMembership.java
@@ -45,7 +45,7 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
 import java.util.Collection;
 import java.util.HashSet;
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfLine.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfLine.java
similarity index 98%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/PdfLine.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfLine.java
index c427b28b8..7f1c32b01 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfLine.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfLine.java
@@ -47,14 +47,14 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
 import java.util.ArrayList;
 import java.util.Iterator;
 
-import com.third.v2.lowagie.text.Chunk;
-import com.third.v2.lowagie.text.Element;
-import com.third.v2.lowagie.text.ListItem;
+import com.fr.third.v2.lowagie.text.Chunk;
+import com.fr.third.v2.lowagie.text.Element;
+import com.fr.third.v2.lowagie.text.ListItem;
 
 /**
  * PdfLine defines an array with PdfChunk-objects
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfLister.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfLister.java
similarity index 99%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/PdfLister.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfLister.java
index a70ed3a3f..ea92e62fe 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfLister.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfLister.java
@@ -49,7 +49,7 @@
  * http://www.lowagie.com/iText/
  */
 
- package com.third.v2.lowagie.text.pdf;
+ package com.fr.third.v2.lowagie.text.pdf;
 
 import java.io.IOException;
 import java.io.PrintStream;
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfLiteral.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfLiteral.java
similarity index 98%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/PdfLiteral.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfLiteral.java
index 86e955912..b768e0127 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfLiteral.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfLiteral.java
@@ -47,7 +47,7 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
 /**
  * a Literal
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfMediaClipData.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfMediaClipData.java
similarity index 98%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/PdfMediaClipData.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfMediaClipData.java
index e0ce21c78..c7d0e081f 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfMediaClipData.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfMediaClipData.java
@@ -44,7 +44,7 @@
  * you aren't using an obsolete version:
  * http://www.lowagie.com/iText/
  */
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
 import java.io.IOException;
 
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfName.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfName.java
similarity index 99%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/PdfName.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfName.java
index 3e138fcb5..2318d3445 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfName.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfName.java
@@ -47,7 +47,7 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfNameTree.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfNameTree.java
similarity index 99%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/PdfNameTree.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfNameTree.java
index c748b0741..933dfdd8a 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfNameTree.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfNameTree.java
@@ -44,7 +44,7 @@
  * you aren't using an obsolete version:
  * http://www.lowagie.com/iText/
  */
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
 import java.io.IOException;
 import java.util.Arrays;
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfNull.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfNull.java
similarity index 98%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/PdfNull.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfNull.java
index d90ec953b..fd1f7f18c 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfNull.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfNull.java
@@ -47,7 +47,7 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
 /**
  * PdfNull is the Null object represented by the keyword null.
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfNumber.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfNumber.java
similarity index 99%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/PdfNumber.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfNumber.java
index a6d218f5f..74cca577c 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfNumber.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfNumber.java
@@ -47,7 +47,7 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
 /**
  * PdfNumber provides two types of numbers, integer and real.
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfNumberTree.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfNumberTree.java
similarity index 99%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/PdfNumberTree.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfNumberTree.java
index a6f2b146c..7be4c4965 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfNumberTree.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfNumberTree.java
@@ -44,7 +44,7 @@
  * you aren't using an obsolete version:
  * http://www.lowagie.com/iText/
  */
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
 import java.io.IOException;
 import java.util.Arrays;
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfOCG.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfOCG.java
similarity index 98%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/PdfOCG.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfOCG.java
index 8dae08d07..906f16da4 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfOCG.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfOCG.java
@@ -44,7 +44,7 @@
  * you aren't using an obsolete version:
  * http://www.lowagie.com/iText/
  */
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
 /**
  * The interface common to all layer types.
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfOCProperties.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfOCProperties.java
similarity index 98%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/PdfOCProperties.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfOCProperties.java
index b08b237d5..a7a062543 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfOCProperties.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfOCProperties.java
@@ -44,7 +44,7 @@
  * you aren't using an obsolete version:
  * http://www.lowagie.com/iText/
  */
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
 /**
  * This class represents the /OCProperties entry in the document catalog
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfObject.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfObject.java
similarity index 99%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/PdfObject.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfObject.java
index b3dc75446..649343931 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfObject.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfObject.java
@@ -47,7 +47,7 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 import java.io.IOException;
 import java.io.OutputStream;
 
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfOutline.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfOutline.java
similarity index 98%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/PdfOutline.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfOutline.java
index 5bb5781aa..563c2c877 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfOutline.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfOutline.java
@@ -47,7 +47,7 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
 import java.awt.Color;
 import java.io.IOException;
@@ -55,9 +55,9 @@ import java.io.OutputStream;
 import java.util.ArrayList;
 import java.util.Iterator;
 
-import com.third.v2.lowagie.text.Chunk;
-import com.third.v2.lowagie.text.Font;
-import com.third.v2.lowagie.text.Paragraph;
+import com.fr.third.v2.lowagie.text.Chunk;
+import com.fr.third.v2.lowagie.text.Font;
+import com.fr.third.v2.lowagie.text.Paragraph;
 
 /**
  * PdfOutline is an object that represents a PDF outline entry.
@@ -325,7 +325,7 @@ public class PdfOutline extends PdfDictionary {
         this.open = open;
         this.parent = parent;
         writer = parent.writer;
-        put(PdfName.TITLE, new PdfString(title, TEXT_UNICODE));
+        put(PdfName.TITLE, new PdfString(title, PdfObject.TEXT_UNICODE));
         parent.addKid(this);
         if (destination != null && !destination.hasPage()) // bugfix Finn Bock
             setDestinationPage(writer.getCurrentPage());
@@ -489,7 +489,7 @@ public class PdfOutline extends PdfDictionary {
      * @param title
      */
     public void setTitle(String title) {
-        put(PdfName.TITLE, new PdfString(title, TEXT_UNICODE));
+        put(PdfName.TITLE, new PdfString(title, PdfObject.TEXT_UNICODE));
     }
     
     /** Getter for property open.
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfPCell.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfPCell.java
similarity index 98%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/PdfPCell.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfPCell.java
index 5b5f5d055..ae874874f 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfPCell.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfPCell.java
@@ -47,24 +47,24 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
 import java.util.List;
 
-import com.third.v2.lowagie.text.Chunk;
-import com.third.v2.lowagie.text.DocumentException;
-import com.third.v2.lowagie.text.Element;
-import com.third.v2.lowagie.text.ExceptionConverter;
-import com.third.v2.lowagie.text.Image;
-import com.third.v2.lowagie.text.Phrase;
-import com.third.v2.lowagie.text.Rectangle;
-import com.third.v2.lowagie.text.pdf.events.PdfPCellEventForwarder;
+import com.fr.third.v2.lowagie.text.Chunk;
+import com.fr.third.v2.lowagie.text.DocumentException;
+import com.fr.third.v2.lowagie.text.Element;
+import com.fr.third.v2.lowagie.text.ExceptionConverter;
+import com.fr.third.v2.lowagie.text.Image;
+import com.fr.third.v2.lowagie.text.Rectangle;
+import com.fr.third.v2.lowagie.text.pdf.events.PdfPCellEventForwarder;
+import com.fr.third.v2.lowagie.text.Phrase;
 
 /**
  * A cell in a PdfPTable.
  */
 
-public class PdfPCell extends Rectangle{
+public class PdfPCell extends Rectangle {
     
     private ColumnText column = new ColumnText(null);
     
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfPCellEvent.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfPCellEvent.java
similarity index 97%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/PdfPCellEvent.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfPCellEvent.java
index 22239a66c..b18aff9a8 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfPCellEvent.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfPCellEvent.java
@@ -44,9 +44,9 @@
  * you aren't using an obsolete version:
  * http://www.lowagie.com/iText/
  */
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
-import com.third.v2.lowagie.text.Rectangle;
+import com.fr.third.v2.lowagie.text.Rectangle;
 
 /** An event called for a single cell.
  * @author Paulo Soares (psoares@consiste.pt)
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfPKCS7.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfPKCS7.java
similarity index 99%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/PdfPKCS7.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfPKCS7.java
index 99b9bfdd0..1497f2eeb 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfPKCS7.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfPKCS7.java
@@ -44,7 +44,7 @@
  * you aren't using an obsolete version:
  * http://www.lowagie.com/iText/
  */
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -75,6 +75,7 @@ import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Set;
 
+import com.fr.third.v2.lowagie.text.ExceptionConverter;
 import org.bouncycastle.asn1.ASN1Encodable;
 import org.bouncycastle.asn1.ASN1EncodableVector;
 import org.bouncycastle.asn1.ASN1InputStream;
@@ -88,7 +89,6 @@ import org.bouncycastle.asn1.DERNull;
 import org.bouncycastle.asn1.DERObject;
 import org.bouncycastle.asn1.DERObjectIdentifier;
 import org.bouncycastle.asn1.DEROctetString;
-import org.bouncycastle.asn1.DEROutputStream;
 import org.bouncycastle.asn1.DERSequence;
 import org.bouncycastle.asn1.DERSet;
 import org.bouncycastle.asn1.DERString;
@@ -100,7 +100,7 @@ import org.bouncycastle.asn1.ocsp.BasicOCSPResponse;
 import org.bouncycastle.asn1.ocsp.OCSPObjectIdentifiers;
 import org.bouncycastle.jce.provider.X509CRLParser;
 import org.bouncycastle.jce.provider.X509CertParser;
-import com.third.v2.lowagie.text.ExceptionConverter;
+
 import java.security.cert.CertificateParsingException;
 import java.util.Date;
 import org.bouncycastle.asn1.ASN1OctetString;
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfPRow.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfPRow.java
similarity index 98%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/PdfPRow.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfPRow.java
index b3e178b47..956e43242 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfPRow.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfPRow.java
@@ -47,15 +47,15 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
 import java.awt.Color;
 
-import com.third.v2.lowagie.text.DocumentException;
-import com.third.v2.lowagie.text.Element;
-import com.third.v2.lowagie.text.ExceptionConverter;
-import com.third.v2.lowagie.text.Image;
-import com.third.v2.lowagie.text.Rectangle;
+import com.fr.third.v2.lowagie.text.ExceptionConverter;
+import com.fr.third.v2.lowagie.text.DocumentException;
+import com.fr.third.v2.lowagie.text.Element;
+import com.fr.third.v2.lowagie.text.Image;
+import com.fr.third.v2.lowagie.text.Rectangle;
 
 /**
  * A row in a PdfPTable.
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfPSXObject.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfPSXObject.java
similarity index 98%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/PdfPSXObject.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfPSXObject.java
index 553dbe103..38427ab21 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfPSXObject.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfPSXObject.java
@@ -44,7 +44,7 @@
  * you aren't using an obsolete version:
  * http://www.lowagie.com/iText/
  */
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
 import java.io.IOException;
 
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfPTable.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfPTable.java
similarity index 99%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/PdfPTable.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfPTable.java
index 960d38e95..8f1addcbd 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfPTable.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfPTable.java
@@ -47,18 +47,18 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
 import java.util.ArrayList;
 
-import com.third.v2.lowagie.text.DocumentException;
-import com.third.v2.lowagie.text.Element;
-import com.third.v2.lowagie.text.ElementListener;
-import com.third.v2.lowagie.text.Image;
-import com.third.v2.lowagie.text.LargeElement;
-import com.third.v2.lowagie.text.Phrase;
-import com.third.v2.lowagie.text.Rectangle;
-import com.third.v2.lowagie.text.pdf.events.PdfPTableEventForwarder;
+import com.fr.third.v2.lowagie.text.DocumentException;
+import com.fr.third.v2.lowagie.text.Element;
+import com.fr.third.v2.lowagie.text.LargeElement;
+import com.fr.third.v2.lowagie.text.ElementListener;
+import com.fr.third.v2.lowagie.text.Image;
+import com.fr.third.v2.lowagie.text.Phrase;
+import com.fr.third.v2.lowagie.text.Rectangle;
+import com.fr.third.v2.lowagie.text.pdf.events.PdfPTableEventForwarder;
 
 /**
  * This is a table that can be put at an absolute position but can also
@@ -71,7 +71,7 @@ import com.third.v2.lowagie.text.pdf.events.PdfPTableEventForwarder;
  * @author Paulo Soares (psoares@consiste.pt)
  */
 
-public class PdfPTable implements LargeElement{
+public class PdfPTable implements LargeElement {
     
     /**
      * The index of the original PdfcontentByte.
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfPTableEvent.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfPTableEvent.java
similarity index 99%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/PdfPTableEvent.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfPTableEvent.java
index fc7324959..0f07a1508 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfPTableEvent.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfPTableEvent.java
@@ -47,7 +47,7 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
 /** An interface that can be used to retrieve the position of cells in PdfPTable.
  *
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfPage.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfPage.java
similarity index 99%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/PdfPage.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfPage.java
index 4f86977c9..0c9eb55af 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfPage.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfPage.java
@@ -47,7 +47,7 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 import java.util.HashMap;
 /**
  * PdfPage is the PDF Page-object.
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfPageElement.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfPageElement.java
similarity index 98%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/PdfPageElement.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfPageElement.java
index 6884b499e..0f7a8def7 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfPageElement.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfPageElement.java
@@ -47,7 +47,7 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
 /**
  * The PdfPageElement interface has to be implemented by PdfPage and PdfPages.
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfPageEvent.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfPageEvent.java
similarity index 97%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/PdfPageEvent.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfPageEvent.java
index 0e2b28c27..288ce5b7f 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfPageEvent.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfPageEvent.java
@@ -47,10 +47,10 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf;
-import com.third.v2.lowagie.text.Document;
-import com.third.v2.lowagie.text.Paragraph;
-import com.third.v2.lowagie.text.Rectangle;
+package com.fr.third.v2.lowagie.text.pdf;
+import com.fr.third.v2.lowagie.text.Document;
+import com.fr.third.v2.lowagie.text.Paragraph;
+import com.fr.third.v2.lowagie.text.Rectangle;
 
 /**
  * Allows a class to catch several document events.
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfPageEventHelper.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfPageEventHelper.java
similarity index 97%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/PdfPageEventHelper.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfPageEventHelper.java
index 05d39380c..159555f28 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfPageEventHelper.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfPageEventHelper.java
@@ -47,10 +47,10 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf;
-import com.third.v2.lowagie.text.Document;
-import com.third.v2.lowagie.text.Paragraph;
-import com.third.v2.lowagie.text.Rectangle;
+package com.fr.third.v2.lowagie.text.pdf;
+import com.fr.third.v2.lowagie.text.Document;
+import com.fr.third.v2.lowagie.text.Paragraph;
+import com.fr.third.v2.lowagie.text.Rectangle;
 
 /**
  * Helps the use of PdfPageEvent by implementing all the interface methods.
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfPageLabels.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfPageLabels.java
similarity index 98%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/PdfPageLabels.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfPageLabels.java
index 144ad67ee..6a4c519c6 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfPageLabels.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfPageLabels.java
@@ -47,15 +47,15 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
+
+import com.fr.third.v2.lowagie.text.ExceptionConverter;
 
-import com.third.v2.lowagie.text.ExceptionConverter;
 import java.io.IOException;
 import java.util.HashMap;
 
-import com.third.v2.lowagie.text.factories.RomanAlphabetFactory;
-import com.third.v2.lowagie.text.factories.RomanNumberFactory;
-
+import com.fr.third.v2.lowagie.text.factories.RomanAlphabetFactory;
+import com.fr.third.v2.lowagie.text.factories.RomanNumberFactory;
 import java.util.Arrays;
 
 /** Page labels are used to identify each
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfPages.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfPages.java
similarity index 97%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/PdfPages.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfPages.java
index 201394703..e1f9d358f 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfPages.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfPages.java
@@ -47,14 +47,14 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
 import java.io.IOException;
 import java.util.ArrayList;
 
-import com.third.v2.lowagie.text.Document;
-import com.third.v2.lowagie.text.DocumentException;
-import com.third.v2.lowagie.text.ExceptionConverter;
+import com.fr.third.v2.lowagie.text.ExceptionConverter;
+import com.fr.third.v2.lowagie.text.Document;
+import com.fr.third.v2.lowagie.text.DocumentException;
 
 /**
  * PdfPages is the PDF Pages-object.
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfPattern.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfPattern.java
similarity index 97%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/PdfPattern.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfPattern.java
index 31bb52265..27733d89c 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfPattern.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfPattern.java
@@ -44,9 +44,9 @@
  * you aren't using an obsolete version:
  * http://www.lowagie.com/iText/
  */
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
-import com.third.v2.lowagie.text.ExceptionConverter;
+import com.fr.third.v2.lowagie.text.ExceptionConverter;
 
 /**
  * A PdfPattern defines a ColorSpace
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfPatternPainter.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfPatternPainter.java
similarity index 98%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/PdfPatternPainter.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfPatternPainter.java
index 63e673c62..9f304b9d1 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfPatternPainter.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfPatternPainter.java
@@ -44,13 +44,13 @@
  * you aren't using an obsolete version:
  * http://www.lowagie.com/iText/
  */
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
 import java.awt.Color;
 
-import com.third.v2.lowagie.text.DocumentException;
-import com.third.v2.lowagie.text.Image;
-import com.third.v2.lowagie.text.Rectangle;
+import com.fr.third.v2.lowagie.text.DocumentException;
+import com.fr.third.v2.lowagie.text.Image;
+import com.fr.third.v2.lowagie.text.Rectangle;
 
 /**
  * Implements the pattern.
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfPrinterGraphics2D.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfPrinterGraphics2D.java
similarity index 98%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/PdfPrinterGraphics2D.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfPrinterGraphics2D.java
index 4131cc645..80f336dd6 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfPrinterGraphics2D.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfPrinterGraphics2D.java
@@ -47,7 +47,7 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
 import java.awt.print.PrinterGraphics;
 import java.awt.print.PrinterJob;
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfPublicKeyRecipient.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfPublicKeyRecipient.java
similarity index 98%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/PdfPublicKeyRecipient.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfPublicKeyRecipient.java
index 26bb9e2ae..ebd4a0468 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfPublicKeyRecipient.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfPublicKeyRecipient.java
@@ -47,7 +47,7 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
 import java.security.cert.Certificate;
 
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfPublicKeySecurityHandler.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfPublicKeySecurityHandler.java
similarity index 99%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/PdfPublicKeySecurityHandler.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfPublicKeySecurityHandler.java
index 9840db405..044b9fae6 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfPublicKeySecurityHandler.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfPublicKeySecurityHandler.java
@@ -87,7 +87,7 @@
  *
  */
 
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfReader.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfReader.java
similarity index 99%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/PdfReader.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfReader.java
index 408fa6152..81bf95987 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfReader.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfReader.java
@@ -47,7 +47,7 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -69,15 +69,15 @@ import java.security.Key;
 import java.security.MessageDigest;
 import java.security.cert.Certificate;
 
-import com.third.v2.lowagie.text.DocWriter;
-import com.third.v2.lowagie.text.ExceptionConverter;
-import com.third.v2.lowagie.text.PageSize;
-import com.third.v2.lowagie.text.Rectangle;
-import com.third.v2.lowagie.text.exceptions.BadPasswordException;
-import com.third.v2.lowagie.text.exceptions.InvalidPdfException;
-import com.third.v2.lowagie.text.exceptions.UnsupportedPdfException;
-import com.third.v2.lowagie.text.pdf.interfaces.PdfViewerPreferences;
-import com.third.v2.lowagie.text.pdf.internal.PdfViewerPreferencesImp;
+import com.fr.third.v2.lowagie.text.DocWriter;
+import com.fr.third.v2.lowagie.text.ExceptionConverter;
+import com.fr.third.v2.lowagie.text.PageSize;
+import com.fr.third.v2.lowagie.text.Rectangle;
+import com.fr.third.v2.lowagie.text.exceptions.InvalidPdfException;
+import com.fr.third.v2.lowagie.text.exceptions.UnsupportedPdfException;
+import com.fr.third.v2.lowagie.text.pdf.interfaces.PdfViewerPreferences;
+import com.fr.third.v2.lowagie.text.pdf.internal.PdfViewerPreferencesImp;
+import com.fr.third.v2.lowagie.text.exceptions.BadPasswordException;
 
 import org.bouncycastle.cms.CMSEnvelopedData;
 import org.bouncycastle.cms.RecipientInformation;
@@ -3154,7 +3154,7 @@ public class PdfReader implements PdfViewerPreferences {
          */
         public PdfDictionary getPageN(int pageNum) {
             PRIndirectReference ref = getPageOrigRef(pageNum);
-            return (PdfDictionary)PdfReader.getPdfObject(ref);
+            return (PdfDictionary) getPdfObject(ref);
         }
 
         /**
@@ -3379,7 +3379,7 @@ public class PdfReader implements PdfViewerPreferences {
                 }
             }
             PRIndirectReference parent = (PRIndirectReference)reader.catalog.get(PdfName.PAGES);
-            PdfDictionary topPages = (PdfDictionary)PdfReader.getPdfObject(parent);
+            PdfDictionary topPages = (PdfDictionary) getPdfObject(parent);
             ArrayList newPageRefs = new ArrayList(finalPages.size());
             PdfArray kids = new PdfArray();
             for (int k = 0; k < finalPages.size(); ++k) {
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfReaderInstance.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfReaderInstance.java
similarity index 99%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/PdfReaderInstance.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfReaderInstance.java
index 64c84f670..948075a88 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfReaderInstance.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfReaderInstance.java
@@ -47,7 +47,7 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfRectangle.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfRectangle.java
similarity index 98%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/PdfRectangle.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfRectangle.java
index 5e6979d36..38d73fb7b 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfRectangle.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfRectangle.java
@@ -47,9 +47,9 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
-import com.third.v2.lowagie.text.Rectangle;
+import com.fr.third.v2.lowagie.text.Rectangle;
 
 /**
  * PdfRectangle is the PDF Rectangle object.
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfRendition.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfRendition.java
similarity index 98%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/PdfRendition.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfRendition.java
index eed7cc7cd..fae9d3b59 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfRendition.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfRendition.java
@@ -44,7 +44,7 @@
  * you aren't using an obsolete version:
  * http://www.lowagie.com/iText/
  */
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
 import java.io.IOException;
 
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfResources.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfResources.java
similarity index 98%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/PdfResources.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfResources.java
index d5331cea1..535055440 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfResources.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfResources.java
@@ -47,7 +47,7 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
 /**
  * PdfResources is the PDF Resources-object.
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfShading.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfShading.java
similarity index 99%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/PdfShading.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfShading.java
index 2dc096d20..ce08edb9b 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfShading.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfShading.java
@@ -44,7 +44,7 @@
  * you aren't using an obsolete version:
  * http://www.lowagie.com/iText/
  */
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
 import java.awt.Color;
 import java.io.IOException;
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfShadingPattern.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfShadingPattern.java
similarity index 99%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/PdfShadingPattern.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfShadingPattern.java
index 769c6a057..176df17fb 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfShadingPattern.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfShadingPattern.java
@@ -44,7 +44,7 @@
  * you aren't using an obsolete version:
  * http://www.lowagie.com/iText/
  */
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
 import java.io.IOException;
 /** Implements the shading pattern dictionary.
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfSigGenericPKCS.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfSigGenericPKCS.java
similarity index 98%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/PdfSigGenericPKCS.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfSigGenericPKCS.java
index cf9603a13..d9cfaf323 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfSigGenericPKCS.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfSigGenericPKCS.java
@@ -44,14 +44,14 @@
  * you aren't using an obsolete version:
  * http://www.lowagie.com/iText/
  */
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
 import java.io.ByteArrayOutputStream;
 import java.security.PrivateKey;
 import java.security.cert.CRL;
 import java.security.cert.Certificate;
 
-import com.third.v2.lowagie.text.ExceptionConverter;
+import com.fr.third.v2.lowagie.text.ExceptionConverter;
 
 /**
  * A signature dictionary representation for the standard filters.
@@ -110,7 +110,7 @@ public abstract class PdfSigGenericPKCS extends PdfSignature {
                 setContents(pkcs.getEncodedPKCS7());
             name = PdfPKCS7.getSubjectFields(pkcs.getSigningCertificate()).getField("CN");
             if (name != null)
-                put(PdfName.NAME, new PdfString(name, PdfObject.TEXT_UNICODE));
+                put(PdfName.NAME, new PdfString(name, TEXT_UNICODE));
             pkcs = new PdfPKCS7(privKey, certChain, crlList, hashAlgorithm, provider, PdfName.ADBE_PKCS7_SHA1.equals(get(PdfName.SUBFILTER)));
             pkcs.setExternalDigest(externalDigest, externalRSAdata, digestEncryptionAlgorithm);
         }
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfSignature.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfSignature.java
similarity index 91%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/PdfSignature.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfSignature.java
index fdb3ba66d..e20ccc825 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfSignature.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfSignature.java
@@ -45,7 +45,7 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
 /** Implements the signature dictionary.
  *
@@ -76,7 +76,7 @@ public class PdfSignature extends PdfDictionary {
     }
     
     public void setName(String name) {
-        put(PdfName.NAME, new PdfString(name, TEXT_UNICODE));
+        put(PdfName.NAME, new PdfString(name, PdfObject.TEXT_UNICODE));
     }
 
     public void setDate(PdfDate date) {
@@ -84,14 +84,14 @@ public class PdfSignature extends PdfDictionary {
     }
 
     public void setLocation(String name) {
-        put(PdfName.LOCATION, new PdfString(name, TEXT_UNICODE));
+        put(PdfName.LOCATION, new PdfString(name, PdfObject.TEXT_UNICODE));
     }
 
     public void setReason(String name) {
-        put(PdfName.REASON, new PdfString(name, TEXT_UNICODE));
+        put(PdfName.REASON, new PdfString(name, PdfObject.TEXT_UNICODE));
     }
     
     public void setContact(String name) {
-        put(PdfName.CONTACTINFO, new PdfString(name, TEXT_UNICODE));
+        put(PdfName.CONTACTINFO, new PdfString(name, PdfObject.TEXT_UNICODE));
     }
 }
\ No newline at end of file
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfSignatureAppearance.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfSignatureAppearance.java
similarity index 99%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/PdfSignatureAppearance.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfSignatureAppearance.java
index d0094daa5..877ef4d59 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfSignatureAppearance.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfSignatureAppearance.java
@@ -46,7 +46,7 @@
  * you aren't using an obsolete version:
  * http://www.lowagie.com/iText/
  */
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
 import java.io.EOFException;
 import java.io.File;
@@ -66,15 +66,15 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 
-import com.third.v2.lowagie.text.Chunk;
-import com.third.v2.lowagie.text.DocumentException;
-import com.third.v2.lowagie.text.Element;
-import com.third.v2.lowagie.text.ExceptionConverter;
-import com.third.v2.lowagie.text.Font;
-import com.third.v2.lowagie.text.Image;
-import com.third.v2.lowagie.text.Paragraph;
-import com.third.v2.lowagie.text.Phrase;
-import com.third.v2.lowagie.text.Rectangle;
+import com.fr.third.v2.lowagie.text.Chunk;
+import com.fr.third.v2.lowagie.text.DocumentException;
+import com.fr.third.v2.lowagie.text.Element;
+import com.fr.third.v2.lowagie.text.ExceptionConverter;
+import com.fr.third.v2.lowagie.text.Font;
+import com.fr.third.v2.lowagie.text.Image;
+import com.fr.third.v2.lowagie.text.Rectangle;
+import com.fr.third.v2.lowagie.text.Paragraph;
+import com.fr.third.v2.lowagie.text.Phrase;
 
 /**
  * This class takes care of the cryptographic options and appearances that form a signature.
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfSmartCopy.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfSmartCopy.java
similarity index 97%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/PdfSmartCopy.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfSmartCopy.java
index d00bcccb3..d17104f25 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfSmartCopy.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfSmartCopy.java
@@ -48,7 +48,7 @@
  * you aren't using an obsolete version:
  * http://www.lowagie.com/iText/
  */
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
 import java.io.IOException;
 import java.io.OutputStream;
@@ -56,9 +56,9 @@ import java.security.MessageDigest;
 import java.util.Arrays;
 import java.util.HashMap;
 
-import com.third.v2.lowagie.text.Document;
-import com.third.v2.lowagie.text.DocumentException;
-import com.third.v2.lowagie.text.ExceptionConverter;
+import com.fr.third.v2.lowagie.text.Document;
+import com.fr.third.v2.lowagie.text.DocumentException;
+import com.fr.third.v2.lowagie.text.ExceptionConverter;
 
 /**
  * PdfSmartCopy has the same functionality as PdfCopy,
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfSpotColor.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfSpotColor.java
similarity index 99%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/PdfSpotColor.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfSpotColor.java
index fb48faee9..0c5a93a90 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfSpotColor.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfSpotColor.java
@@ -47,7 +47,7 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
 import java.awt.Color;
 
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfStamper.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfStamper.java
similarity index 98%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/PdfStamper.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfStamper.java
index bc4c28b43..10d9e167d 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfStamper.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfStamper.java
@@ -44,7 +44,7 @@
  * you aren't using an obsolete version:
  * http://www.lowagie.com/iText/
  */
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -56,14 +56,14 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import com.third.v2.lowagie.text.DocWriter;
-import com.third.v2.lowagie.text.DocumentException;
-import com.third.v2.lowagie.text.ExceptionConverter;
-import com.third.v2.lowagie.text.Image;
-import com.third.v2.lowagie.text.Rectangle;
-import com.third.v2.lowagie.text.pdf.collection.PdfCollection;
-import com.third.v2.lowagie.text.pdf.interfaces.PdfEncryptionSettings;
-import com.third.v2.lowagie.text.pdf.interfaces.PdfViewerPreferences;
+import com.fr.third.v2.lowagie.text.ExceptionConverter;
+import com.fr.third.v2.lowagie.text.pdf.collection.PdfCollection;
+import com.fr.third.v2.lowagie.text.pdf.interfaces.PdfViewerPreferences;
+import com.fr.third.v2.lowagie.text.DocWriter;
+import com.fr.third.v2.lowagie.text.DocumentException;
+import com.fr.third.v2.lowagie.text.Image;
+import com.fr.third.v2.lowagie.text.Rectangle;
+import com.fr.third.v2.lowagie.text.pdf.interfaces.PdfEncryptionSettings;
 
 import java.security.cert.Certificate;
 
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfStamperImp.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfStamperImp.java
similarity index 99%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/PdfStamperImp.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfStamperImp.java
index 42b61934b..0a4369ba8 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfStamperImp.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfStamperImp.java
@@ -44,7 +44,7 @@
  * you aren't using an obsolete version:
  * http://www.lowagie.com/iText/
  */
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
 import java.io.IOException;
 import java.io.OutputStream;
@@ -54,18 +54,18 @@ import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Map;
 
-import com.third.v2.lowagie.text.DocumentException;
+import com.fr.third.v2.lowagie.text.ExceptionConverter;
+import com.fr.third.v2.lowagie.text.pdf.collection.PdfCollection;
+import com.fr.third.v2.lowagie.text.pdf.interfaces.PdfViewerPreferences;
+import com.fr.third.v2.lowagie.text.pdf.internal.PdfViewerPreferencesImp;
+import com.fr.third.v2.lowagie.text.xml.xmp.XmpReader;
 import org.xml.sax.SAXException;
 
-import com.third.v2.lowagie.text.Document;
-import com.third.v2.lowagie.text.ExceptionConverter;
-import com.third.v2.lowagie.text.Image;
-import com.third.v2.lowagie.text.Rectangle;
-import com.third.v2.lowagie.text.exceptions.BadPasswordException;
-import com.third.v2.lowagie.text.pdf.collection.PdfCollection;
-import com.third.v2.lowagie.text.pdf.interfaces.PdfViewerPreferences;
-import com.third.v2.lowagie.text.pdf.internal.PdfViewerPreferencesImp;
-import com.third.v2.lowagie.text.xml.xmp.XmpReader;
+import com.fr.third.v2.lowagie.text.Document;
+import com.fr.third.v2.lowagie.text.DocumentException;
+import com.fr.third.v2.lowagie.text.Image;
+import com.fr.third.v2.lowagie.text.Rectangle;
+import com.fr.third.v2.lowagie.text.exceptions.BadPasswordException;
 
 class PdfStamperImp extends PdfWriter {
     HashMap readers2intrefs = new HashMap();
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfStream.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfStream.java
similarity index 98%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/PdfStream.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfStream.java
index fd459148f..36fc005df 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfStream.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfStream.java
@@ -47,7 +47,7 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -56,9 +56,9 @@ import java.io.OutputStream;
 import java.util.zip.Deflater;
 import java.util.zip.DeflaterOutputStream;
 
-import com.third.v2.lowagie.text.DocWriter;
-import com.third.v2.lowagie.text.Document;
-import com.third.v2.lowagie.text.ExceptionConverter;
+import com.fr.third.v2.lowagie.text.ExceptionConverter;
+import com.fr.third.v2.lowagie.text.DocWriter;
+import com.fr.third.v2.lowagie.text.Document;
 
 /**
  * PdfStream is the Pdf stream object.
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfString.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfString.java
similarity index 97%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/PdfString.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfString.java
index 85c6327bf..db1595dfa 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfString.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfString.java
@@ -47,7 +47,7 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
 import java.io.IOException;
 import java.io.OutputStream;
@@ -193,9 +193,9 @@ public class PdfString extends PdfObject {
             return value;
         getBytes();
         if (bytes.length >= 2 && bytes[0] == (byte)254 && bytes[1] == (byte)255)
-            return PdfEncodings.convertToString(bytes, PdfObject.TEXT_UNICODE);
+            return PdfEncodings.convertToString(bytes, TEXT_UNICODE);
         else
-            return PdfEncodings.convertToString(bytes, PdfObject.TEXT_PDFDOCENCODING);
+            return PdfEncodings.convertToString(bytes, TEXT_PDFDOCENCODING);
     }
     
     /**
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfStructureElement.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfStructureElement.java
similarity index 99%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/PdfStructureElement.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfStructureElement.java
index ac9f5b956..dccbb475c 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfStructureElement.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfStructureElement.java
@@ -47,7 +47,7 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
 /**
  * This is a node in a document logical structure. It may contain a mark point or it may contain
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfStructureTreeRoot.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfStructureTreeRoot.java
similarity index 99%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/PdfStructureTreeRoot.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfStructureTreeRoot.java
index 8d520e5d9..952ec474d 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfStructureTreeRoot.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfStructureTreeRoot.java
@@ -46,7 +46,7 @@
  * you aren't using an obsolete version:
  * http://www.lowagie.com/iText/
  */
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
 import java.io.IOException;
 import java.util.ArrayList;
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfTable.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfTable.java
similarity index 97%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/PdfTable.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfTable.java
index 2bb4d5255..cca2c3e6c 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfTable.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfTable.java
@@ -47,16 +47,16 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
 import java.util.ArrayList;
 import java.util.Iterator;
 
-import com.third.v2.lowagie.text.Cell;
-import com.third.v2.lowagie.text.Element;
-import com.third.v2.lowagie.text.Rectangle;
-import com.third.v2.lowagie.text.Row;
-import com.third.v2.lowagie.text.Table;
+import com.fr.third.v2.lowagie.text.Row;
+import com.fr.third.v2.lowagie.text.Cell;
+import com.fr.third.v2.lowagie.text.Element;
+import com.fr.third.v2.lowagie.text.Rectangle;
+import com.fr.third.v2.lowagie.text.Table;
 
 /**
  * PdfTable is an object that contains the graphics and text of a table.
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfTemplate.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfTemplate.java
similarity index 99%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/PdfTemplate.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfTemplate.java
index 7a7746942..e89f23e3c 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfTemplate.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfTemplate.java
@@ -47,10 +47,10 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 import java.io.IOException;
 
-import com.third.v2.lowagie.text.Rectangle;
+import com.fr.third.v2.lowagie.text.Rectangle;
 
 /**
  * Implements the form XObject.
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfTextArray.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfTextArray.java
similarity index 99%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/PdfTextArray.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfTextArray.java
index d7d87e78d..f4f7b79a1 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfTextArray.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfTextArray.java
@@ -47,7 +47,7 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
 import java.util.ArrayList;
 
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfTransition.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfTransition.java
similarity index 99%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/PdfTransition.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfTransition.java
index 935793ead..2ff9eed6d 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfTransition.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfTransition.java
@@ -45,7 +45,7 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
 public class PdfTransition {
     /**
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfTransparencyGroup.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfTransparencyGroup.java
similarity index 98%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/PdfTransparencyGroup.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfTransparencyGroup.java
index ad5196d6c..adfc156d4 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfTransparencyGroup.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfTransparencyGroup.java
@@ -44,7 +44,7 @@
  * you aren't using an obsolete version:
  * http://www.lowagie.com/iText/
  */
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
 /** The transparency group dictionary.
  *
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfWriter.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfWriter.java
similarity index 98%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/PdfWriter.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfWriter.java
index 75931aaa8..13f0fd98b 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfWriter.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfWriter.java
@@ -47,7 +47,7 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
 import java.awt.Color;
 import java.awt.color.ICC_Profile;
@@ -65,29 +65,29 @@ import java.util.TreeMap;
 import java.util.TreeSet;
 import java.security.cert.Certificate;
 
-import com.third.v2.lowagie.text.DocListener;
-import com.third.v2.lowagie.text.DocWriter;
-import com.third.v2.lowagie.text.Document;
-import com.third.v2.lowagie.text.DocumentException;
-import com.third.v2.lowagie.text.ExceptionConverter;
-import com.third.v2.lowagie.text.Image;
-import com.third.v2.lowagie.text.ImgJBIG2;
-import com.third.v2.lowagie.text.ImgWMF;
-import com.third.v2.lowagie.text.Rectangle;
-import com.third.v2.lowagie.text.Table;
-import com.third.v2.lowagie.text.pdf.collection.PdfCollection;
-import com.third.v2.lowagie.text.pdf.events.PdfPageEventForwarder;
-import com.third.v2.lowagie.text.pdf.interfaces.PdfAnnotations;
-import com.third.v2.lowagie.text.pdf.interfaces.PdfDocumentActions;
-import com.third.v2.lowagie.text.pdf.interfaces.PdfEncryptionSettings;
-import com.third.v2.lowagie.text.pdf.interfaces.PdfPageActions;
-import com.third.v2.lowagie.text.pdf.interfaces.PdfVersion;
-import com.third.v2.lowagie.text.pdf.interfaces.PdfViewerPreferences;
-import com.third.v2.lowagie.text.pdf.interfaces.PdfXConformance;
-import com.third.v2.lowagie.text.pdf.interfaces.PdfRunDirection;
-import com.third.v2.lowagie.text.pdf.internal.PdfVersionImp;
-import com.third.v2.lowagie.text.pdf.internal.PdfXConformanceImp;
-import com.third.v2.lowagie.text.xml.xmp.XmpWriter;
+import com.fr.third.v2.lowagie.text.DocListener;
+import com.fr.third.v2.lowagie.text.DocWriter;
+import com.fr.third.v2.lowagie.text.Document;
+import com.fr.third.v2.lowagie.text.DocumentException;
+import com.fr.third.v2.lowagie.text.ExceptionConverter;
+import com.fr.third.v2.lowagie.text.Image;
+import com.fr.third.v2.lowagie.text.ImgJBIG2;
+import com.fr.third.v2.lowagie.text.Rectangle;
+import com.fr.third.v2.lowagie.text.Table;
+import com.fr.third.v2.lowagie.text.pdf.collection.PdfCollection;
+import com.fr.third.v2.lowagie.text.pdf.events.PdfPageEventForwarder;
+import com.fr.third.v2.lowagie.text.pdf.interfaces.PdfAnnotations;
+import com.fr.third.v2.lowagie.text.pdf.interfaces.PdfDocumentActions;
+import com.fr.third.v2.lowagie.text.pdf.interfaces.PdfEncryptionSettings;
+import com.fr.third.v2.lowagie.text.pdf.interfaces.PdfPageActions;
+import com.fr.third.v2.lowagie.text.pdf.interfaces.PdfRunDirection;
+import com.fr.third.v2.lowagie.text.pdf.interfaces.PdfVersion;
+import com.fr.third.v2.lowagie.text.pdf.interfaces.PdfViewerPreferences;
+import com.fr.third.v2.lowagie.text.pdf.interfaces.PdfXConformance;
+import com.fr.third.v2.lowagie.text.pdf.internal.PdfVersionImp;
+import com.fr.third.v2.lowagie.text.pdf.internal.PdfXConformanceImp;
+import com.fr.third.v2.lowagie.text.xml.xmp.XmpWriter;
+import com.fr.third.v2.lowagie.text.ImgWMF;
 
 /**
  * A DocWriter class for PDF.
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfXConformanceException.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfXConformanceException.java
similarity index 98%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/PdfXConformanceException.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfXConformanceException.java
index 31493b53f..e8eb4ab59 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/PdfXConformanceException.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfXConformanceException.java
@@ -47,7 +47,7 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
 /**
  *
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/Pfm2afm.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/Pfm2afm.java
similarity index 99%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/Pfm2afm.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/Pfm2afm.java
index cdecb7b2a..5066a01df 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/Pfm2afm.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/Pfm2afm.java
@@ -138,7 +138,7 @@
  *  the removal of an exception in readString was restored on 9/16  *
  *                                                                  *
  ********************************************************************/
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
 import java.io.FileOutputStream;
 import java.io.IOException;
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/PushbuttonField.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PushbuttonField.java
similarity index 99%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/PushbuttonField.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PushbuttonField.java
index d22b3a8fd..6c68805e0 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/PushbuttonField.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PushbuttonField.java
@@ -44,14 +44,13 @@
  * you aren't using an obsolete version:
  * http://www.lowagie.com/iText/
  */
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
 import java.io.IOException;
 
-import com.third.v2.lowagie.text.DocumentException;
-import com.third.v2.lowagie.text.Image;
-import com.third.v2.lowagie.text.Rectangle;
-
+import com.fr.third.v2.lowagie.text.DocumentException;
+import com.fr.third.v2.lowagie.text.Image;
+import com.fr.third.v2.lowagie.text.Rectangle;
 /**
  * Creates a pushbutton field. It supports all the text and icon alignments.
  * The icon may be an image or a template.
@@ -114,7 +113,7 @@ public class PushbuttonField extends BaseField {
     /**
      * Holds value of property image.
      */
-    private Image image;
+    private Image image;    
     
     /**
      * Holds value of property template.
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/RadioCheckField.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/RadioCheckField.java
similarity index 98%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/RadioCheckField.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/RadioCheckField.java
index 286a79381..bc79d606b 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/RadioCheckField.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/RadioCheckField.java
@@ -44,13 +44,13 @@
  * you aren't using an obsolete version:
  * http://www.lowagie.com/iText/
  */
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
 import java.io.IOException;
 
-import com.third.v2.lowagie.text.DocumentException;
-import com.third.v2.lowagie.text.ExceptionConverter;
-import com.third.v2.lowagie.text.Rectangle;
+import com.fr.third.v2.lowagie.text.ExceptionConverter;
+import com.fr.third.v2.lowagie.text.DocumentException;
+import com.fr.third.v2.lowagie.text.Rectangle;
 
 /**
  * Creates a radio or a check field.
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/RandomAccessFileOrArray.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/RandomAccessFileOrArray.java
similarity index 99%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/RandomAccessFileOrArray.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/RandomAccessFileOrArray.java
index 72d54a31c..a6f945f88 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/RandomAccessFileOrArray.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/RandomAccessFileOrArray.java
@@ -47,10 +47,9 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf;
-
-import com.third.v2.lowagie.text.Document;
+package com.fr.third.v2.lowagie.text.pdf;
 
+import com.fr.third.v2.lowagie.text.Document;
 import java.io.ByteArrayOutputStream;
 import java.io.DataInput;
 import java.io.DataInputStream;
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/SequenceList.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/SequenceList.java
similarity index 99%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/SequenceList.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/SequenceList.java
index 153a5612c..0ee934616 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/SequenceList.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/SequenceList.java
@@ -44,7 +44,7 @@
  * you aren't using an obsolete version:
  * http://www.lowagie.com/iText/
  */
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
 import java.util.LinkedList;
 import java.util.List;
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/ShadingColor.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/ShadingColor.java
similarity index 98%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/ShadingColor.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/ShadingColor.java
index 4ad9b54d1..cd34e7a29 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/ShadingColor.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/ShadingColor.java
@@ -45,7 +45,7 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
 /** Implements a shading pattern as a Color.
  *
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/SimpleBookmark.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/SimpleBookmark.java
similarity index 99%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/SimpleBookmark.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/SimpleBookmark.java
index 1fc420b01..9caad2bc0 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/SimpleBookmark.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/SimpleBookmark.java
@@ -45,7 +45,7 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
 import java.io.BufferedWriter;
 import java.io.IOException;
@@ -62,9 +62,9 @@ import java.util.Map;
 import java.util.Stack;
 import java.util.StringTokenizer;
 
-import com.third.v2.lowagie.text.xml.simpleparser.IanaEncodings;
-import com.third.v2.lowagie.text.xml.simpleparser.SimpleXMLDocHandler;
-import com.third.v2.lowagie.text.xml.simpleparser.SimpleXMLParser;
+import com.fr.third.v2.lowagie.text.xml.simpleparser.IanaEncodings;
+import com.fr.third.v2.lowagie.text.xml.simpleparser.SimpleXMLParser;
+import com.fr.third.v2.lowagie.text.xml.simpleparser.SimpleXMLDocHandler;
 
 /**
  * Bookmark processing in a simple way. It has some limitations, mainly the only
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/SimpleNamedDestination.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/SimpleNamedDestination.java
similarity index 98%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/SimpleNamedDestination.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/SimpleNamedDestination.java
index 8834008c6..d74fd5ee1 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/SimpleNamedDestination.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/SimpleNamedDestination.java
@@ -44,7 +44,7 @@
  * you aren't using an obsolete version:
  * http://www.lowagie.com/iText/
  */
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
 import java.io.BufferedWriter;
 import java.io.IOException;
@@ -58,9 +58,9 @@ import java.util.Iterator;
 import java.util.Map;
 import java.util.StringTokenizer;
 
-import com.third.v2.lowagie.text.xml.simpleparser.IanaEncodings;
-import com.third.v2.lowagie.text.xml.simpleparser.SimpleXMLDocHandler;
-import com.third.v2.lowagie.text.xml.simpleparser.SimpleXMLParser;
+import com.fr.third.v2.lowagie.text.xml.simpleparser.IanaEncodings;
+import com.fr.third.v2.lowagie.text.xml.simpleparser.SimpleXMLParser;
+import com.fr.third.v2.lowagie.text.xml.simpleparser.SimpleXMLDocHandler;
 
 /**
  *
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/SpotColor.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/SpotColor.java
similarity index 98%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/SpotColor.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/SpotColor.java
index c5c34e781..36b975726 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/SpotColor.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/SpotColor.java
@@ -47,7 +47,7 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
 /**
  *
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/StampContent.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/StampContent.java
similarity index 98%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/StampContent.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/StampContent.java
index b00ac302c..b722619f4 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/StampContent.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/StampContent.java
@@ -44,7 +44,7 @@
  * you aren't using an obsolete version:
  * http://www.lowagie.com/iText/
  */
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
 public class StampContent extends PdfContentByte {
     PdfStamperImp.PageStamp ps;
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/StandardDecryption.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/StandardDecryption.java
similarity index 96%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/StandardDecryption.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/StandardDecryption.java
index 21d2de9aa..d9638a746 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/StandardDecryption.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/StandardDecryption.java
@@ -46,10 +46,10 @@
  * you aren't using an obsolete version:
  * http://www.lowagie.com/iText/
  */
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
-import com.third.v2.lowagie.text.pdf.crypto.AESCipher;
-import com.third.v2.lowagie.text.pdf.crypto.ARCFOUREncryption;
+import com.fr.third.v2.lowagie.text.pdf.crypto.ARCFOUREncryption;
+import com.fr.third.v2.lowagie.text.pdf.crypto.AESCipher;
 
 public class StandardDecryption {
     protected ARCFOUREncryption arcfour;
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/TSAClient.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/TSAClient.java
similarity index 98%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/TSAClient.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/TSAClient.java
index e16d591a6..68e84932e 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/TSAClient.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/TSAClient.java
@@ -47,7 +47,7 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
 /**
  * Time Stamp Authority client (caller) interface.
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/TSAClientBouncyCastle.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/TSAClientBouncyCastle.java
similarity index 99%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/TSAClientBouncyCastle.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/TSAClientBouncyCastle.java
index be7d94f64..29e65e60d 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/TSAClientBouncyCastle.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/TSAClientBouncyCastle.java
@@ -47,7 +47,7 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
 import java.io.*;
 import java.math.*;
@@ -57,7 +57,7 @@ import org.bouncycastle.asn1.cmp.*;
 import org.bouncycastle.asn1.x509.*;
 import org.bouncycastle.tsp.*;
 
-import com.third.v2.lowagie.text.pdf.codec.Base64;
+import com.fr.third.v2.lowagie.text.pdf.codec.Base64;
 
 /**
  * Time Stamp Authority Client interface implementation using Bouncy Castle
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/TextField.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/TextField.java
similarity index 98%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/TextField.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/TextField.java
index c7e37b0ab..524a05748 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/TextField.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/TextField.java
@@ -45,18 +45,18 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
 import java.awt.Color;
 import java.io.IOException;
 import java.util.ArrayList;
 
-import com.third.v2.lowagie.text.Chunk;
-import com.third.v2.lowagie.text.DocumentException;
-import com.third.v2.lowagie.text.Element;
-import com.third.v2.lowagie.text.Font;
-import com.third.v2.lowagie.text.Phrase;
-import com.third.v2.lowagie.text.Rectangle;
+import com.fr.third.v2.lowagie.text.Chunk;
+import com.fr.third.v2.lowagie.text.DocumentException;
+import com.fr.third.v2.lowagie.text.Element;
+import com.fr.third.v2.lowagie.text.Font;
+import com.fr.third.v2.lowagie.text.Phrase;
+import com.fr.third.v2.lowagie.text.Rectangle;
 
 /**
  * Supports text, combo and list fields generating the correct appearances.
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/TrueTypeFont.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/TrueTypeFont.java
similarity index 99%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/TrueTypeFont.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/TrueTypeFont.java
index c1b34935a..f5eb650f4 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/TrueTypeFont.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/TrueTypeFont.java
@@ -47,7 +47,7 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
 import java.io.File;
 import java.io.IOException;
@@ -56,9 +56,9 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 
-import com.third.v2.lowagie.text.Document;
-import com.third.v2.lowagie.text.DocumentException;
-import com.third.v2.lowagie.text.ExceptionConverter;
+import com.fr.third.v2.lowagie.text.Document;
+import com.fr.third.v2.lowagie.text.DocumentException;
+import com.fr.third.v2.lowagie.text.ExceptionConverter;
 
 /** Reads a Truetype font
  *
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/TrueTypeFontSubSet.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/TrueTypeFontSubSet.java
similarity index 99%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/TrueTypeFontSubSet.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/TrueTypeFontSubSet.java
index 3bbba5be5..5bd26dd8a 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/TrueTypeFontSubSet.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/TrueTypeFontSubSet.java
@@ -47,15 +47,15 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
 
-import com.third.v2.lowagie.text.DocumentException;
-import com.third.v2.lowagie.text.ExceptionConverter;
+import com.fr.third.v2.lowagie.text.DocumentException;
+import com.fr.third.v2.lowagie.text.ExceptionConverter;
 
 /** Subsets a True Type font by removing the unneeded glyphs from
  * the font.
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/TrueTypeFontUnicode.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/TrueTypeFontUnicode.java
similarity index 99%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/TrueTypeFontUnicode.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/TrueTypeFontUnicode.java
index 495e1dd68..74e6e55c1 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/TrueTypeFontUnicode.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/TrueTypeFontUnicode.java
@@ -47,15 +47,15 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.Comparator;
 import java.util.HashMap;
 
-import com.third.v2.lowagie.text.DocumentException;
-import com.third.v2.lowagie.text.Utilities;
+import com.fr.third.v2.lowagie.text.DocumentException;
+import com.fr.third.v2.lowagie.text.Utilities;
 
 /** Represents a True Type font with Unicode encoding. All the character
  * in the font can be used directly by using the encoding Identity-H or
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/Type1Font.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/Type1Font.java
similarity index 99%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/Type1Font.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/Type1Font.java
index f63db09d0..25fd3b9ff 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/Type1Font.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/Type1Font.java
@@ -47,7 +47,7 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -55,9 +55,9 @@ import java.io.InputStream;
 import java.util.HashMap;
 import java.util.StringTokenizer;
 
-import com.third.v2.lowagie.text.Document;
-import com.third.v2.lowagie.text.DocumentException;
-import com.third.v2.lowagie.text.pdf.fonts.FontsResourceAnchor;
+import com.fr.third.v2.lowagie.text.DocumentException;
+import com.fr.third.v2.lowagie.text.pdf.fonts.FontsResourceAnchor;
+import com.fr.third.v2.lowagie.text.Document;
 
 /** Reads a Type1 font
  *
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/Type3Font.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/Type3Font.java
similarity index 99%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/Type3Font.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/Type3Font.java
index 5dfe99eec..8c01dc670 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/Type3Font.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/Type3Font.java
@@ -45,11 +45,11 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
 import java.util.HashMap;
 
-import com.third.v2.lowagie.text.DocumentException;
+import com.fr.third.v2.lowagie.text.DocumentException;
 
 /**
  * A class to support Type3 fonts.
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/Type3Glyph.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/Type3Glyph.java
similarity index 96%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/Type3Glyph.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/Type3Glyph.java
index 6e861a523..1d10a1317 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/Type3Glyph.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/Type3Glyph.java
@@ -45,10 +45,9 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf;
-import com.third.v2.lowagie.text.DocumentException;
-import com.third.v2.lowagie.text.Image;
-
+package com.fr.third.v2.lowagie.text.pdf;
+import com.fr.third.v2.lowagie.text.DocumentException;
+import com.fr.third.v2.lowagie.text.Image;
 /**
  * The content where Type3 glyphs are written to.
  */
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/VerticalText.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/VerticalText.java
similarity index 98%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/VerticalText.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/VerticalText.java
index 5fdb22c1f..e59725d3a 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/VerticalText.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/VerticalText.java
@@ -45,14 +45,14 @@
  * you aren't using an obsolete version:
  * http://www.lowagie.com/iText/
  */
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 import java.awt.Color;
 import java.util.ArrayList;
 import java.util.Iterator;
 
-import com.third.v2.lowagie.text.Chunk;
-import com.third.v2.lowagie.text.Element;
-import com.third.v2.lowagie.text.Phrase;
+import com.fr.third.v2.lowagie.text.Chunk;
+import com.fr.third.v2.lowagie.text.Element;
+import com.fr.third.v2.lowagie.text.Phrase;
 
 /** Writes text vertically. Note that the naming is done according
  * to horizontal text although it refers to vertical text.
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/XfaForm.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/XfaForm.java
similarity index 99%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/XfaForm.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/XfaForm.java
index 051db10ee..6ffbed536 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/XfaForm.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/XfaForm.java
@@ -47,7 +47,7 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -62,10 +62,11 @@ import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
 
-import com.third.v2.lowagie.text.xml.XmlDomWriter;
 import org.w3c.dom.Node;
 import org.xml.sax.SAXException;
 
+import com.fr.third.v2.lowagie.text.xml.XmlDomWriter;
+
 /**
  * Processes XFA forms.
  * @author Paulo Soares (psoares@consiste.pt)
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/XfdfReader.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/XfdfReader.java
similarity index 97%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/XfdfReader.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/XfdfReader.java
index 518bc4d9c..977940b24 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/XfdfReader.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/XfdfReader.java
@@ -46,7 +46,7 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf;
+package com.fr.third.v2.lowagie.text.pdf;
 
 import java.io.ByteArrayInputStream;
 import java.io.FileInputStream;
@@ -56,8 +56,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Stack;
 
-import com.third.v2.lowagie.text.xml.simpleparser.SimpleXMLDocHandler;
-import com.third.v2.lowagie.text.xml.simpleparser.SimpleXMLParser;
+import com.fr.third.v2.lowagie.text.xml.simpleparser.SimpleXMLParser;
+import com.fr.third.v2.lowagie.text.xml.simpleparser.SimpleXMLDocHandler;
 
 /**
  * Reads a XFDF.
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/codec/Base64.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/codec/Base64.java
similarity index 99%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/codec/Base64.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/codec/Base64.java
index 32a3eeed9..174b2b052 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/codec/Base64.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/codec/Base64.java
@@ -1,4 +1,4 @@
-package com.third.v2.lowagie.text.pdf.codec;
+package com.fr.third.v2.lowagie.text.pdf.codec;
 
 /**
  * 
Encodes and decodes to and from Base64 notation.

diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/codec/BmpImage.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/codec/BmpImage.java
similarity index 98%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/codec/BmpImage.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/codec/BmpImage.java
index 7ae032c80..8e3942c60 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/codec/BmpImage.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/codec/BmpImage.java
@@ -86,7 +86,7 @@
  * use in the design, construction, operation or maintenance of any 
  * nuclear facility.
  */
-package com.third.v2.lowagie.text.pdf.codec;
+package com.fr.third.v2.lowagie.text.pdf.codec;
 
 import java.io.BufferedInputStream;
 import java.io.ByteArrayInputStream;
@@ -95,16 +95,16 @@ import java.io.InputStream;
 import java.net.URL;
 import java.util.HashMap;
 
-import com.third.v2.lowagie.text.BadElementException;
-import com.third.v2.lowagie.text.ExceptionConverter;
-import com.third.v2.lowagie.text.Image;
-import com.third.v2.lowagie.text.ImgRaw;
-import com.third.v2.lowagie.text.Utilities;
-import com.third.v2.lowagie.text.pdf.PdfArray;
-import com.third.v2.lowagie.text.pdf.PdfDictionary;
-import com.third.v2.lowagie.text.pdf.PdfName;
-import com.third.v2.lowagie.text.pdf.PdfNumber;
-import com.third.v2.lowagie.text.pdf.PdfString;
+import com.fr.third.v2.lowagie.text.BadElementException;
+import com.fr.third.v2.lowagie.text.ExceptionConverter;
+import com.fr.third.v2.lowagie.text.Image;
+import com.fr.third.v2.lowagie.text.ImgRaw;
+import com.fr.third.v2.lowagie.text.pdf.PdfArray;
+import com.fr.third.v2.lowagie.text.pdf.PdfDictionary;
+import com.fr.third.v2.lowagie.text.pdf.PdfName;
+import com.fr.third.v2.lowagie.text.pdf.PdfNumber;
+import com.fr.third.v2.lowagie.text.pdf.PdfString;
+import com.fr.third.v2.lowagie.text.Utilities;
 
 /** Reads a BMP image. All types of BMP can be read.
  * 

diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/codec/CCITTG4Encoder.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/codec/CCITTG4Encoder.java
similarity index 99%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/codec/CCITTG4Encoder.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/codec/CCITTG4Encoder.java
index b4195affc..b6a0bd9e7 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/codec/CCITTG4Encoder.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/codec/CCITTG4Encoder.java
@@ -46,9 +46,9 @@
  *
  * This code is base in the libtiff encoder
  */
-package com.third.v2.lowagie.text.pdf.codec;
+package com.fr.third.v2.lowagie.text.pdf.codec;
 
-import com.third.v2.lowagie.text.pdf.ByteBuffer;
+import com.fr.third.v2.lowagie.text.pdf.ByteBuffer;
 
 /**
  * Encodes data in the CCITT G4 FAX format.
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/codec/GifImage.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/codec/GifImage.java
similarity index 97%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/codec/GifImage.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/codec/GifImage.java
index 92b426307..4e8473b23 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/codec/GifImage.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/codec/GifImage.java
@@ -44,7 +44,7 @@
  * you aren't using an obsolete version:
  * http://www.lowagie.com/iText/
  */
-package com.third.v2.lowagie.text.pdf.codec;
+package com.fr.third.v2.lowagie.text.pdf.codec;
 
 import java.io.BufferedInputStream;
 import java.io.ByteArrayInputStream;
@@ -54,15 +54,15 @@ import java.io.InputStream;
 import java.net.URL;
 import java.util.ArrayList;
 
-import com.third.v2.lowagie.text.ExceptionConverter;
-import com.third.v2.lowagie.text.Image;
-import com.third.v2.lowagie.text.ImgRaw;
-import com.third.v2.lowagie.text.Utilities;
-import com.third.v2.lowagie.text.pdf.PdfArray;
-import com.third.v2.lowagie.text.pdf.PdfDictionary;
-import com.third.v2.lowagie.text.pdf.PdfName;
-import com.third.v2.lowagie.text.pdf.PdfNumber;
-import com.third.v2.lowagie.text.pdf.PdfString;
+import com.fr.third.v2.lowagie.text.ExceptionConverter;
+import com.fr.third.v2.lowagie.text.Image;
+import com.fr.third.v2.lowagie.text.ImgRaw;
+import com.fr.third.v2.lowagie.text.Utilities;
+import com.fr.third.v2.lowagie.text.pdf.PdfArray;
+import com.fr.third.v2.lowagie.text.pdf.PdfDictionary;
+import com.fr.third.v2.lowagie.text.pdf.PdfName;
+import com.fr.third.v2.lowagie.text.pdf.PdfNumber;
+import com.fr.third.v2.lowagie.text.pdf.PdfString;
 
 /** Reads gif images of all types. All the images in a gif are read in the constructors
  * and can be retrieved with other methods.
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/codec/JBIG2Image.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/codec/JBIG2Image.java
similarity index 94%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/codec/JBIG2Image.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/codec/JBIG2Image.java
index 792997352..07147f9d0 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/codec/JBIG2Image.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/codec/JBIG2Image.java
@@ -47,12 +47,12 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf.codec;
+package com.fr.third.v2.lowagie.text.pdf.codec;
 
-import com.third.v2.lowagie.text.ExceptionConverter;
-import com.third.v2.lowagie.text.Image;
-import com.third.v2.lowagie.text.ImgJBIG2;
-import com.third.v2.lowagie.text.pdf.RandomAccessFileOrArray;
+import com.fr.third.v2.lowagie.text.ExceptionConverter;
+import com.fr.third.v2.lowagie.text.Image;
+import com.fr.third.v2.lowagie.text.ImgJBIG2;
+import com.fr.third.v2.lowagie.text.pdf.RandomAccessFileOrArray;
 
 /**
  * Support for JBIG2 Images.
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/codec/JBIG2SegmentReader.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/codec/JBIG2SegmentReader.java
similarity index 99%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/codec/JBIG2SegmentReader.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/codec/JBIG2SegmentReader.java
index d525bc708..73236e90f 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/codec/JBIG2SegmentReader.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/codec/JBIG2SegmentReader.java
@@ -47,7 +47,7 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf.codec;
+package com.fr.third.v2.lowagie.text.pdf.codec;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -57,7 +57,7 @@ import java.util.SortedSet;
 import java.util.TreeMap;
 import java.util.TreeSet;
 
-import com.third.v2.lowagie.text.pdf.RandomAccessFileOrArray;
+import com.fr.third.v2.lowagie.text.pdf.RandomAccessFileOrArray;
 
 /**
  * Class to read a JBIG2 file at a basic level: understand all the segments, 
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/codec/PngImage.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/codec/PngImage.java
similarity index 98%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/codec/PngImage.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/codec/PngImage.java
index 2d760bc84..856befaf1 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/codec/PngImage.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/codec/PngImage.java
@@ -87,7 +87,7 @@
  * nuclear facility.
  */
 
-package com.third.v2.lowagie.text.pdf.codec;
+package com.fr.third.v2.lowagie.text.pdf.codec;
 
 import java.awt.color.ICC_Profile;
 import java.io.ByteArrayInputStream;
@@ -99,19 +99,19 @@ import java.net.URL;
 import java.util.zip.Inflater;
 import java.util.zip.InflaterInputStream;
 
-import com.third.v2.lowagie.text.ExceptionConverter;
-import com.third.v2.lowagie.text.Image;
-import com.third.v2.lowagie.text.ImgRaw;
-import com.third.v2.lowagie.text.Utilities;
-import com.third.v2.lowagie.text.pdf.ByteBuffer;
-import com.third.v2.lowagie.text.pdf.PdfArray;
-import com.third.v2.lowagie.text.pdf.PdfDictionary;
-import com.third.v2.lowagie.text.pdf.PdfLiteral;
-import com.third.v2.lowagie.text.pdf.PdfName;
-import com.third.v2.lowagie.text.pdf.PdfNumber;
-import com.third.v2.lowagie.text.pdf.PdfObject;
-import com.third.v2.lowagie.text.pdf.PdfReader;
-import com.third.v2.lowagie.text.pdf.PdfString;
+import com.fr.third.v2.lowagie.text.ExceptionConverter;
+import com.fr.third.v2.lowagie.text.pdf.ByteBuffer;
+import com.fr.third.v2.lowagie.text.pdf.PdfName;
+import com.fr.third.v2.lowagie.text.pdf.PdfNumber;
+import com.fr.third.v2.lowagie.text.Image;
+import com.fr.third.v2.lowagie.text.ImgRaw;
+import com.fr.third.v2.lowagie.text.Utilities;
+import com.fr.third.v2.lowagie.text.pdf.PdfArray;
+import com.fr.third.v2.lowagie.text.pdf.PdfDictionary;
+import com.fr.third.v2.lowagie.text.pdf.PdfLiteral;
+import com.fr.third.v2.lowagie.text.pdf.PdfObject;
+import com.fr.third.v2.lowagie.text.pdf.PdfReader;
+import com.fr.third.v2.lowagie.text.pdf.PdfString;
 
 /** Reads a PNG image. All types of PNG can be read.
  * 

diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/codec/TIFFConstants.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/codec/TIFFConstants.java
similarity index 99%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/codec/TIFFConstants.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/codec/TIFFConstants.java
index a6e49e0e5..131566d62 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/codec/TIFFConstants.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/codec/TIFFConstants.java
@@ -26,7 +26,7 @@
  * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE 
  * OF THIS SOFTWARE.
  */
-package com.third.v2.lowagie.text.pdf.codec;
+package com.fr.third.v2.lowagie.text.pdf.codec;
 
 /**
  * A list of constants used in class TIFFImage.
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/codec/TIFFDirectory.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/codec/TIFFDirectory.java
similarity index 99%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/codec/TIFFDirectory.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/codec/TIFFDirectory.java
index 403a5343c..2859c1e57 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/codec/TIFFDirectory.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/codec/TIFFDirectory.java
@@ -43,7 +43,7 @@
  * use in the design, construction, operation or maintenance of any 
  * nuclear facility.
  */
-package com.third.v2.lowagie.text.pdf.codec;
+package com.fr.third.v2.lowagie.text.pdf.codec;
 import java.io.EOFException;
 import java.io.IOException;
 import java.io.Serializable;
@@ -51,7 +51,7 @@ import java.util.ArrayList;
 import java.util.Enumeration;
 import java.util.Hashtable;
 
-import com.third.v2.lowagie.text.pdf.RandomAccessFileOrArray;
+import com.fr.third.v2.lowagie.text.pdf.RandomAccessFileOrArray;
 
 /**
  * A class representing an Image File Directory (IFD) from a TIFF 6.0
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/codec/TIFFFaxDecoder.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/codec/TIFFFaxDecoder.java
similarity index 99%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/codec/TIFFFaxDecoder.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/codec/TIFFFaxDecoder.java
index 9d2d94a0f..b0831cb00 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/codec/TIFFFaxDecoder.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/codec/TIFFFaxDecoder.java
@@ -43,7 +43,7 @@
  * use in the design, construction, operation or maintenance of any 
  * nuclear facility. 
  */
-package com.third.v2.lowagie.text.pdf.codec;
+package com.fr.third.v2.lowagie.text.pdf.codec;
 
 public class TIFFFaxDecoder {
     
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/codec/TIFFField.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/codec/TIFFField.java
similarity index 99%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/codec/TIFFField.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/codec/TIFFField.java
index 8bed1c6ee..b4677fe5a 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/codec/TIFFField.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/codec/TIFFField.java
@@ -43,7 +43,7 @@
  * use in the design, construction, operation or maintenance of any 
  * nuclear facility. 
  */
-package com.third.v2.lowagie.text.pdf.codec;
+package com.fr.third.v2.lowagie.text.pdf.codec;
 
 import java.io.Serializable;
 
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/codec/TIFFLZWDecoder.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/codec/TIFFLZWDecoder.java
similarity index 99%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/codec/TIFFLZWDecoder.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/codec/TIFFLZWDecoder.java
index 6bdcdaa34..4c3627e12 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/codec/TIFFLZWDecoder.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/codec/TIFFLZWDecoder.java
@@ -43,7 +43,7 @@
  * use in the design, construction, operation or maintenance of any 
  * nuclear facility.
  */
-package com.third.v2.lowagie.text.pdf.codec;
+package com.fr.third.v2.lowagie.text.pdf.codec;
 
 /**
  * A class for performing LZW decoding.
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/codec/TiffImage.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/codec/TiffImage.java
similarity index 98%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/codec/TiffImage.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/codec/TiffImage.java
index 087cfd702..ad1e19ac5 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/codec/TiffImage.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/codec/TiffImage.java
@@ -44,7 +44,7 @@
  * you aren't using an obsolete version:
  * http://www.lowagie.com/iText/
  */
-package com.third.v2.lowagie.text.pdf.codec;
+package com.fr.third.v2.lowagie.text.pdf.codec;
 import java.awt.color.ICC_Profile;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -52,15 +52,15 @@ import java.util.zip.DataFormatException;
 import java.util.zip.DeflaterOutputStream;
 import java.util.zip.Inflater;
 
-import com.third.v2.lowagie.text.ExceptionConverter;
-import com.third.v2.lowagie.text.Image;
-import com.third.v2.lowagie.text.Jpeg;
-import com.third.v2.lowagie.text.pdf.PdfArray;
-import com.third.v2.lowagie.text.pdf.PdfDictionary;
-import com.third.v2.lowagie.text.pdf.PdfName;
-import com.third.v2.lowagie.text.pdf.PdfNumber;
-import com.third.v2.lowagie.text.pdf.PdfString;
-import com.third.v2.lowagie.text.pdf.RandomAccessFileOrArray;
+import com.fr.third.v2.lowagie.text.ExceptionConverter;
+import com.fr.third.v2.lowagie.text.Image;
+import com.fr.third.v2.lowagie.text.Jpeg;
+import com.fr.third.v2.lowagie.text.pdf.PdfArray;
+import com.fr.third.v2.lowagie.text.pdf.PdfDictionary;
+import com.fr.third.v2.lowagie.text.pdf.PdfName;
+import com.fr.third.v2.lowagie.text.pdf.PdfNumber;
+import com.fr.third.v2.lowagie.text.pdf.PdfString;
+import com.fr.third.v2.lowagie.text.pdf.RandomAccessFileOrArray;
 
 /** Reads TIFF images
  * @author Paulo Soares (psoares@consiste.pt)
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/codec/wmf/InputMeta.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/codec/wmf/InputMeta.java
similarity index 97%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/codec/wmf/InputMeta.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/codec/wmf/InputMeta.java
index b45f9872d..253578a11 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/codec/wmf/InputMeta.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/codec/wmf/InputMeta.java
@@ -47,13 +47,13 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf.codec.wmf;
+package com.fr.third.v2.lowagie.text.pdf.codec.wmf;
 
 import java.awt.Color;
 import java.io.IOException;
 import java.io.InputStream;
 
-import com.third.v2.lowagie.text.Utilities;
+import com.fr.third.v2.lowagie.text.Utilities;
 
 public class InputMeta {
     
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/codec/wmf/MetaBrush.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/codec/wmf/MetaBrush.java
similarity index 98%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/codec/wmf/MetaBrush.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/codec/wmf/MetaBrush.java
index 015469509..62fc38129 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/codec/wmf/MetaBrush.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/codec/wmf/MetaBrush.java
@@ -47,7 +47,7 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf.codec.wmf;
+package com.fr.third.v2.lowagie.text.pdf.codec.wmf;
 import java.awt.Color;
 import java.io.IOException;
 
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/codec/wmf/MetaDo.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/codec/wmf/MetaDo.java
similarity index 98%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/codec/wmf/MetaDo.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/codec/wmf/MetaDo.java
index 5e659399c..e97a65dbd 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/codec/wmf/MetaDo.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/codec/wmf/MetaDo.java
@@ -47,7 +47,7 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf.codec.wmf;
+package com.fr.third.v2.lowagie.text.pdf.codec.wmf;
 import java.awt.Color;
 import java.awt.Point;
 import java.io.ByteArrayInputStream;
@@ -58,11 +58,11 @@ import java.io.OutputStream;
 import java.io.UnsupportedEncodingException;
 import java.util.ArrayList;
 
-import com.third.v2.lowagie.text.DocumentException;
-import com.third.v2.lowagie.text.Image;
-import com.third.v2.lowagie.text.pdf.BaseFont;
-import com.third.v2.lowagie.text.pdf.PdfContentByte;
-import com.third.v2.lowagie.text.pdf.codec.BmpImage;
+import com.fr.third.v2.lowagie.text.DocumentException;
+import com.fr.third.v2.lowagie.text.Image;
+import com.fr.third.v2.lowagie.text.pdf.BaseFont;
+import com.fr.third.v2.lowagie.text.pdf.PdfContentByte;
+import com.fr.third.v2.lowagie.text.pdf.codec.BmpImage;
 
 public class MetaDo {
     
@@ -149,7 +149,7 @@ public class MetaDo {
         this.in = new InputMeta(in);
     }
     
-    public void readAll() throws IOException, DocumentException {
+    public void readAll() throws IOException, DocumentException{
         if (in.readInt() != 0x9AC6CDD7) {
             throw new DocumentException("Not a placeable windows metafile");
         }
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/codec/wmf/MetaFont.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/codec/wmf/MetaFont.java
similarity index 96%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/codec/wmf/MetaFont.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/codec/wmf/MetaFont.java
index c60749a0c..3076ba8b1 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/codec/wmf/MetaFont.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/codec/wmf/MetaFont.java
@@ -47,15 +47,15 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf.codec.wmf;
-import com.third.v2.lowagie.text.Document;
+package com.fr.third.v2.lowagie.text.pdf.codec.wmf;
+import com.fr.third.v2.lowagie.text.ExceptionConverter;
+import com.fr.third.v2.lowagie.text.Document;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 
-import com.third.v2.lowagie.text.ExceptionConverter;
-import com.third.v2.lowagie.text.Font;
-import com.third.v2.lowagie.text.FontFactory;
-import com.third.v2.lowagie.text.pdf.BaseFont;
+import com.fr.third.v2.lowagie.text.Font;
+import com.fr.third.v2.lowagie.text.FontFactory;
+import com.fr.third.v2.lowagie.text.pdf.BaseFont;
 
 public class MetaFont extends MetaObject {
     static final String fontNames[] = {
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/codec/wmf/MetaObject.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/codec/wmf/MetaObject.java
similarity index 98%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/codec/wmf/MetaObject.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/codec/wmf/MetaObject.java
index d94b23f2a..f057383aa 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/codec/wmf/MetaObject.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/codec/wmf/MetaObject.java
@@ -47,7 +47,7 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf.codec.wmf;
+package com.fr.third.v2.lowagie.text.pdf.codec.wmf;
 
 public class MetaObject {
     public static final int META_NOT_SUPPORTED = 0;
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/codec/wmf/MetaPen.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/codec/wmf/MetaPen.java
similarity index 98%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/codec/wmf/MetaPen.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/codec/wmf/MetaPen.java
index 54149e631..9c60b8760 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/codec/wmf/MetaPen.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/codec/wmf/MetaPen.java
@@ -47,7 +47,7 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf.codec.wmf;
+package com.fr.third.v2.lowagie.text.pdf.codec.wmf;
 import java.awt.Color;
 import java.io.IOException;
 
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/codec/wmf/MetaState.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/codec/wmf/MetaState.java
similarity index 99%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/codec/wmf/MetaState.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/codec/wmf/MetaState.java
index d0b4f8222..0583b3161 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/codec/wmf/MetaState.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/codec/wmf/MetaState.java
@@ -47,14 +47,14 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf.codec.wmf;
+package com.fr.third.v2.lowagie.text.pdf.codec.wmf;
 
 import java.awt.Color;
 import java.awt.Point;
 import java.util.ArrayList;
 import java.util.Stack;
 
-import com.third.v2.lowagie.text.pdf.PdfContentByte;
+import com.fr.third.v2.lowagie.text.pdf.PdfContentByte;
 
 public class MetaState {
     
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/collection/PdfCollection.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/collection/PdfCollection.java
similarity index 87%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/collection/PdfCollection.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/collection/PdfCollection.java
index c2edd401a..2b04df522 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/collection/PdfCollection.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/collection/PdfCollection.java
@@ -1,8 +1,8 @@
-package com.third.v2.lowagie.text.pdf.collection;
+package com.fr.third.v2.lowagie.text.pdf.collection;
 
-import com.third.v2.lowagie.text.pdf.PdfDictionary;
-import com.third.v2.lowagie.text.pdf.PdfName;
-import com.third.v2.lowagie.text.pdf.PdfString;
+import com.fr.third.v2.lowagie.text.pdf.PdfName;
+import com.fr.third.v2.lowagie.text.pdf.PdfDictionary;
+import com.fr.third.v2.lowagie.text.pdf.PdfString;
 
 public class PdfCollection extends PdfDictionary {
 
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/collection/PdfCollectionField.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/collection/PdfCollectionField.java
similarity index 88%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/collection/PdfCollectionField.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/collection/PdfCollectionField.java
index fb261b3da..e0c92206f 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/collection/PdfCollectionField.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/collection/PdfCollectionField.java
@@ -1,12 +1,12 @@
-package com.third.v2.lowagie.text.pdf.collection;
+package com.fr.third.v2.lowagie.text.pdf.collection;
 
-import com.third.v2.lowagie.text.pdf.PdfBoolean;
-import com.third.v2.lowagie.text.pdf.PdfDate;
-import com.third.v2.lowagie.text.pdf.PdfDictionary;
-import com.third.v2.lowagie.text.pdf.PdfName;
-import com.third.v2.lowagie.text.pdf.PdfNumber;
-import com.third.v2.lowagie.text.pdf.PdfObject;
-import com.third.v2.lowagie.text.pdf.PdfString;
+import com.fr.third.v2.lowagie.text.pdf.PdfBoolean;
+import com.fr.third.v2.lowagie.text.pdf.PdfDate;
+import com.fr.third.v2.lowagie.text.pdf.PdfName;
+import com.fr.third.v2.lowagie.text.pdf.PdfNumber;
+import com.fr.third.v2.lowagie.text.pdf.PdfDictionary;
+import com.fr.third.v2.lowagie.text.pdf.PdfObject;
+import com.fr.third.v2.lowagie.text.pdf.PdfString;
 
 /**
  * @author blowagie
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/collection/PdfCollectionItem.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/collection/PdfCollectionItem.java
similarity index 88%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/collection/PdfCollectionItem.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/collection/PdfCollectionItem.java
index fa1016a5c..5ac9ea33b 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/collection/PdfCollectionItem.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/collection/PdfCollectionItem.java
@@ -1,13 +1,13 @@
-package com.third.v2.lowagie.text.pdf.collection;
+package com.fr.third.v2.lowagie.text.pdf.collection;
 
 import java.util.Calendar;
 
-import com.third.v2.lowagie.text.pdf.PdfDate;
-import com.third.v2.lowagie.text.pdf.PdfDictionary;
-import com.third.v2.lowagie.text.pdf.PdfName;
-import com.third.v2.lowagie.text.pdf.PdfNumber;
-import com.third.v2.lowagie.text.pdf.PdfObject;
-import com.third.v2.lowagie.text.pdf.PdfString;
+import com.fr.third.v2.lowagie.text.pdf.PdfDate;
+import com.fr.third.v2.lowagie.text.pdf.PdfName;
+import com.fr.third.v2.lowagie.text.pdf.PdfNumber;
+import com.fr.third.v2.lowagie.text.pdf.PdfDictionary;
+import com.fr.third.v2.lowagie.text.pdf.PdfObject;
+import com.fr.third.v2.lowagie.text.pdf.PdfString;
 
 public class PdfCollectionItem extends PdfDictionary {
 	
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/collection/PdfCollectionSchema.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/collection/PdfCollectionSchema.java
similarity index 72%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/collection/PdfCollectionSchema.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/collection/PdfCollectionSchema.java
index de3388b6e..f14498547 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/collection/PdfCollectionSchema.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/collection/PdfCollectionSchema.java
@@ -1,7 +1,7 @@
-package com.third.v2.lowagie.text.pdf.collection;
+package com.fr.third.v2.lowagie.text.pdf.collection;
 
-import com.third.v2.lowagie.text.pdf.PdfDictionary;
-import com.third.v2.lowagie.text.pdf.PdfName;
+import com.fr.third.v2.lowagie.text.pdf.PdfDictionary;
+import com.fr.third.v2.lowagie.text.pdf.PdfName;
 
 public class PdfCollectionSchema extends PdfDictionary {
 	/**
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/collection/PdfCollectionSort.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/collection/PdfCollectionSort.java
similarity index 85%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/collection/PdfCollectionSort.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/collection/PdfCollectionSort.java
index 7be659aa8..725c20b27 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/collection/PdfCollectionSort.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/collection/PdfCollectionSort.java
@@ -1,10 +1,10 @@
-package com.third.v2.lowagie.text.pdf.collection;
+package com.fr.third.v2.lowagie.text.pdf.collection;
 
-import com.third.v2.lowagie.text.pdf.PdfArray;
-import com.third.v2.lowagie.text.pdf.PdfBoolean;
-import com.third.v2.lowagie.text.pdf.PdfDictionary;
-import com.third.v2.lowagie.text.pdf.PdfName;
-import com.third.v2.lowagie.text.pdf.PdfObject;
+import com.fr.third.v2.lowagie.text.pdf.PdfArray;
+import com.fr.third.v2.lowagie.text.pdf.PdfBoolean;
+import com.fr.third.v2.lowagie.text.pdf.PdfDictionary;
+import com.fr.third.v2.lowagie.text.pdf.PdfName;
+import com.fr.third.v2.lowagie.text.pdf.PdfObject;
 
 public class PdfCollectionSort extends PdfDictionary {
 	
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/collection/PdfTargetDictionary.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/collection/PdfTargetDictionary.java
similarity index 91%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/collection/PdfTargetDictionary.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/collection/PdfTargetDictionary.java
index 2f13cc22e..3af9c6bf1 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/collection/PdfTargetDictionary.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/collection/PdfTargetDictionary.java
@@ -1,10 +1,10 @@
-package com.third.v2.lowagie.text.pdf.collection;
+package com.fr.third.v2.lowagie.text.pdf.collection;
 
-import com.third.v2.lowagie.text.pdf.PdfDictionary;
-import com.third.v2.lowagie.text.pdf.PdfName;
-import com.third.v2.lowagie.text.pdf.PdfNumber;
-import com.third.v2.lowagie.text.pdf.PdfObject;
-import com.third.v2.lowagie.text.pdf.PdfString;
+import com.fr.third.v2.lowagie.text.pdf.PdfDictionary;
+import com.fr.third.v2.lowagie.text.pdf.PdfName;
+import com.fr.third.v2.lowagie.text.pdf.PdfNumber;
+import com.fr.third.v2.lowagie.text.pdf.PdfObject;
+import com.fr.third.v2.lowagie.text.pdf.PdfString;
 
 public class PdfTargetDictionary extends PdfDictionary {
 	
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/crypto/AESCipher.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/crypto/AESCipher.java
similarity index 98%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/crypto/AESCipher.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/crypto/AESCipher.java
index 3c4b01491..1070603b5 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/crypto/AESCipher.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/crypto/AESCipher.java
@@ -46,7 +46,7 @@
  * you aren't using an obsolete version:
  * http://www.lowagie.com/iText/
  */
-package com.third.v2.lowagie.text.pdf.crypto;
+package com.fr.third.v2.lowagie.text.pdf.crypto;
 
 import org.bouncycastle.crypto.BlockCipher;
 import org.bouncycastle.crypto.engines.AESFastEngine;
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/crypto/ARCFOUREncryption.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/crypto/ARCFOUREncryption.java
similarity index 98%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/crypto/ARCFOUREncryption.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/crypto/ARCFOUREncryption.java
index ee7668a2c..a877bb905 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/crypto/ARCFOUREncryption.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/crypto/ARCFOUREncryption.java
@@ -46,7 +46,7 @@
  * you aren't using an obsolete version:
  * http://www.lowagie.com/iText/
  */
-package com.third.v2.lowagie.text.pdf.crypto;
+package com.fr.third.v2.lowagie.text.pdf.crypto;
 
 public class ARCFOUREncryption {
     private byte state[] = new byte[256];
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/crypto/IVGenerator.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/crypto/IVGenerator.java
similarity index 98%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/crypto/IVGenerator.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/crypto/IVGenerator.java
index 8e254e0de..2296fcceb 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/crypto/IVGenerator.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/crypto/IVGenerator.java
@@ -46,7 +46,7 @@
  * you aren't using an obsolete version:
  * http://www.lowagie.com/iText/
  */
-package com.third.v2.lowagie.text.pdf.crypto;
+package com.fr.third.v2.lowagie.text.pdf.crypto;
 
 /**
  * An initialization vector generator for a CBC block encryption. It's a random generator based on ARCFOUR.
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/draw/DottedLineSeparator.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/draw/DottedLineSeparator.java
similarity index 97%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/draw/DottedLineSeparator.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/draw/DottedLineSeparator.java
index 2e79a3a44..c8bdcc3fe 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/draw/DottedLineSeparator.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/draw/DottedLineSeparator.java
@@ -47,9 +47,9 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf.draw;
+package com.fr.third.v2.lowagie.text.pdf.draw;
 
-import com.third.v2.lowagie.text.pdf.PdfContentByte;
+import com.fr.third.v2.lowagie.text.pdf.PdfContentByte;
 
 /**
  * Element that draws a dotted line from left to right.
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/draw/DrawInterface.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/draw/DrawInterface.java
similarity index 96%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/draw/DrawInterface.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/draw/DrawInterface.java
index a6db82024..c9a261669 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/draw/DrawInterface.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/draw/DrawInterface.java
@@ -47,9 +47,9 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf.draw;
+package com.fr.third.v2.lowagie.text.pdf.draw;
 
-import com.third.v2.lowagie.text.pdf.PdfContentByte;
+import com.fr.third.v2.lowagie.text.pdf.PdfContentByte;
 
 /**
  * Interface for an Element that allows you to draw something at the current
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/draw/LineSeparator.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/draw/LineSeparator.java
similarity index 97%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/draw/LineSeparator.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/draw/LineSeparator.java
index 8e3156147..7f588816c 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/draw/LineSeparator.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/draw/LineSeparator.java
@@ -47,10 +47,10 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf.draw;
+package com.fr.third.v2.lowagie.text.pdf.draw;
 
-import com.third.v2.lowagie.text.Element;
-import com.third.v2.lowagie.text.pdf.PdfContentByte;
+import com.fr.third.v2.lowagie.text.Element;
+import com.fr.third.v2.lowagie.text.pdf.PdfContentByte;
 
 import java.awt.Color;
 
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/draw/VerticalPositionMark.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/draw/VerticalPositionMark.java
similarity index 94%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/draw/VerticalPositionMark.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/draw/VerticalPositionMark.java
index 5d3bd80b5..a5eb6dfb9 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/draw/VerticalPositionMark.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/draw/VerticalPositionMark.java
@@ -47,15 +47,15 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf.draw;
+package com.fr.third.v2.lowagie.text.pdf.draw;
 
 import java.util.ArrayList;
 
-import com.third.v2.lowagie.text.Chunk;
-import com.third.v2.lowagie.text.DocumentException;
-import com.third.v2.lowagie.text.Element;
-import com.third.v2.lowagie.text.ElementListener;
-import com.third.v2.lowagie.text.pdf.PdfContentByte;
+import com.fr.third.v2.lowagie.text.Chunk;
+import com.fr.third.v2.lowagie.text.DocumentException;
+import com.fr.third.v2.lowagie.text.Element;
+import com.fr.third.v2.lowagie.text.ElementListener;
+import com.fr.third.v2.lowagie.text.pdf.PdfContentByte;
 
 /**
  * Helper class implementing the DrawInterface. Can be used to add
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/events/FieldPositioningEvents.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/events/FieldPositioningEvents.java
similarity index 89%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/events/FieldPositioningEvents.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/events/FieldPositioningEvents.java
index 684ee36dc..461d26028 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/events/FieldPositioningEvents.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/events/FieldPositioningEvents.java
@@ -44,25 +44,25 @@
  * you aren't using an obsolete version:
  * http://www.lowagie.com/iText/
  */
-package com.third.v2.lowagie.text.pdf.events;
+package com.fr.third.v2.lowagie.text.pdf.events;
 
 import java.io.IOException;
 import java.util.HashMap;
 
-import com.third.v2.lowagie.text.Document;
-import com.third.v2.lowagie.text.DocumentException;
-import com.third.v2.lowagie.text.ExceptionConverter;
-import com.third.v2.lowagie.text.Rectangle;
-import com.third.v2.lowagie.text.pdf.PdfContentByte;
-import com.third.v2.lowagie.text.pdf.PdfFormField;
-import com.third.v2.lowagie.text.pdf.PdfName;
-import com.third.v2.lowagie.text.pdf.PdfPCell;
-import com.third.v2.lowagie.text.pdf.PdfPCellEvent;
-import com.third.v2.lowagie.text.pdf.PdfPageEventHelper;
-import com.third.v2.lowagie.text.pdf.PdfRectangle;
-import com.third.v2.lowagie.text.pdf.PdfWriter;
-import com.third.v2.lowagie.text.pdf.TextField;
-import com.third.v2.lowagie.text.pdf.PdfPageEvent;
+import com.fr.third.v2.lowagie.text.pdf.PdfPageEvent;
+import com.fr.third.v2.lowagie.text.Document;
+import com.fr.third.v2.lowagie.text.DocumentException;
+import com.fr.third.v2.lowagie.text.ExceptionConverter;
+import com.fr.third.v2.lowagie.text.Rectangle;
+import com.fr.third.v2.lowagie.text.pdf.PdfContentByte;
+import com.fr.third.v2.lowagie.text.pdf.PdfFormField;
+import com.fr.third.v2.lowagie.text.pdf.PdfName;
+import com.fr.third.v2.lowagie.text.pdf.PdfPCell;
+import com.fr.third.v2.lowagie.text.pdf.PdfPCellEvent;
+import com.fr.third.v2.lowagie.text.pdf.PdfPageEventHelper;
+import com.fr.third.v2.lowagie.text.pdf.PdfRectangle;
+import com.fr.third.v2.lowagie.text.pdf.PdfWriter;
+import com.fr.third.v2.lowagie.text.pdf.TextField;
 
 /**
  * Class that can be used to position AcroForm fields.
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/events/IndexEvents.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/events/IndexEvents.java
similarity index 97%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/events/IndexEvents.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/events/IndexEvents.java
index 6b945472b..03b6bf2b7 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/events/IndexEvents.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/events/IndexEvents.java
@@ -44,7 +44,7 @@
  * you aren't using an obsolete version:
  * http://www.lowagie.com/iText/
  */
-package com.third.v2.lowagie.text.pdf.events;
+package com.fr.third.v2.lowagie.text.pdf.events;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -54,11 +54,11 @@ import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
 
-import com.third.v2.lowagie.text.Chunk;
-import com.third.v2.lowagie.text.Document;
-import com.third.v2.lowagie.text.Rectangle;
-import com.third.v2.lowagie.text.pdf.PdfPageEventHelper;
-import com.third.v2.lowagie.text.pdf.PdfWriter;
+import com.fr.third.v2.lowagie.text.Chunk;
+import com.fr.third.v2.lowagie.text.pdf.PdfPageEventHelper;
+import com.fr.third.v2.lowagie.text.Document;
+import com.fr.third.v2.lowagie.text.Rectangle;
+import com.fr.third.v2.lowagie.text.pdf.PdfWriter;
 
 /**
  * Class for an index.
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/events/PdfPCellEventForwarder.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/events/PdfPCellEventForwarder.java
similarity index 93%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/events/PdfPCellEventForwarder.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/events/PdfPCellEventForwarder.java
index 00efa65a3..5e777845a 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/events/PdfPCellEventForwarder.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/events/PdfPCellEventForwarder.java
@@ -47,15 +47,15 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf.events;
+package com.fr.third.v2.lowagie.text.pdf.events;
 
 import java.util.ArrayList;
 import java.util.Iterator;
 
-import com.third.v2.lowagie.text.Rectangle;
-import com.third.v2.lowagie.text.pdf.PdfContentByte;
-import com.third.v2.lowagie.text.pdf.PdfPCell;
-import com.third.v2.lowagie.text.pdf.PdfPCellEvent;
+import com.fr.third.v2.lowagie.text.pdf.PdfContentByte;
+import com.fr.third.v2.lowagie.text.Rectangle;
+import com.fr.third.v2.lowagie.text.pdf.PdfPCell;
+import com.fr.third.v2.lowagie.text.pdf.PdfPCellEvent;
 
 /**
  * If you want to add more than one event to a cell,
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/events/PdfPTableEventForwarder.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/events/PdfPTableEventForwarder.java
similarity index 94%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/events/PdfPTableEventForwarder.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/events/PdfPTableEventForwarder.java
index 2a7a9e0c0..bb1802cf6 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/events/PdfPTableEventForwarder.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/events/PdfPTableEventForwarder.java
@@ -47,14 +47,14 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf.events;
+package com.fr.third.v2.lowagie.text.pdf.events;
 
 import java.util.ArrayList;
 import java.util.Iterator;
 
-import com.third.v2.lowagie.text.pdf.PdfContentByte;
-import com.third.v2.lowagie.text.pdf.PdfPTable;
-import com.third.v2.lowagie.text.pdf.PdfPTableEvent;
+import com.fr.third.v2.lowagie.text.pdf.PdfContentByte;
+import com.fr.third.v2.lowagie.text.pdf.PdfPTable;
+import com.fr.third.v2.lowagie.text.pdf.PdfPTableEvent;
 
 /**
  * If you want to add more than one page event to a PdfPTable,
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/events/PdfPageEventForwarder.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/events/PdfPageEventForwarder.java
similarity index 96%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/events/PdfPageEventForwarder.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/events/PdfPageEventForwarder.java
index 57150ad7d..fc599b27d 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/events/PdfPageEventForwarder.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/events/PdfPageEventForwarder.java
@@ -47,16 +47,16 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf.events;
+package com.fr.third.v2.lowagie.text.pdf.events;
 
 import java.util.ArrayList;
 import java.util.Iterator;
 
-import com.third.v2.lowagie.text.Document;
-import com.third.v2.lowagie.text.Paragraph;
-import com.third.v2.lowagie.text.Rectangle;
-import com.third.v2.lowagie.text.pdf.PdfPageEvent;
-import com.third.v2.lowagie.text.pdf.PdfWriter;
+import com.fr.third.v2.lowagie.text.Document;
+import com.fr.third.v2.lowagie.text.Rectangle;
+import com.fr.third.v2.lowagie.text.pdf.PdfPageEvent;
+import com.fr.third.v2.lowagie.text.Paragraph;
+import com.fr.third.v2.lowagie.text.pdf.PdfWriter;
 
 /**
  * If you want to add more than one page event to a PdfWriter,
@@ -301,7 +301,7 @@ public class PdfPageEventForwarder implements PdfPageEvent {
 	 *            the text of the tag
 	 */
 	public void onGenericTag(PdfWriter writer, Document document,
-			Rectangle rect, String text) {
+                             Rectangle rect, String text) {
 		PdfPageEvent event;
 		for (Iterator i = events.iterator(); i.hasNext(); ) {
 			event = (PdfPageEvent)i.next();
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/fonts/Courier-Bold.afm b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/fonts/Courier-Bold.afm
similarity index 100%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/fonts/Courier-Bold.afm
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/fonts/Courier-Bold.afm
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/fonts/Courier-BoldOblique.afm b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/fonts/Courier-BoldOblique.afm
similarity index 100%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/fonts/Courier-BoldOblique.afm
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/fonts/Courier-BoldOblique.afm
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/fonts/Courier-Oblique.afm b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/fonts/Courier-Oblique.afm
similarity index 100%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/fonts/Courier-Oblique.afm
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/fonts/Courier-Oblique.afm
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/fonts/Courier.afm b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/fonts/Courier.afm
similarity index 100%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/fonts/Courier.afm
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/fonts/Courier.afm
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/fonts/FontsResourceAnchor.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/fonts/FontsResourceAnchor.java
similarity index 98%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/fonts/FontsResourceAnchor.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/fonts/FontsResourceAnchor.java
index fba329fc4..96eb12937 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/fonts/FontsResourceAnchor.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/fonts/FontsResourceAnchor.java
@@ -44,7 +44,7 @@
  * you aren't using an obsolete version:
  * http://www.lowagie.com/iText/
  */
-package com.third.v2.lowagie.text.pdf.fonts;
+package com.fr.third.v2.lowagie.text.pdf.fonts;
 
 /**
  * A class to facilitate the loading of resources
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/fonts/Helvetica-Bold.afm b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/fonts/Helvetica-Bold.afm
similarity index 100%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/fonts/Helvetica-Bold.afm
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/fonts/Helvetica-Bold.afm
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/fonts/Helvetica-BoldOblique.afm b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/fonts/Helvetica-BoldOblique.afm
similarity index 100%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/fonts/Helvetica-BoldOblique.afm
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/fonts/Helvetica-BoldOblique.afm
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/fonts/Helvetica-Oblique.afm b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/fonts/Helvetica-Oblique.afm
similarity index 100%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/fonts/Helvetica-Oblique.afm
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/fonts/Helvetica-Oblique.afm
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/fonts/Helvetica.afm b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/fonts/Helvetica.afm
similarity index 100%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/fonts/Helvetica.afm
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/fonts/Helvetica.afm
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/fonts/Symbol.afm b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/fonts/Symbol.afm
similarity index 100%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/fonts/Symbol.afm
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/fonts/Symbol.afm
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/fonts/Times-Bold.afm b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/fonts/Times-Bold.afm
similarity index 100%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/fonts/Times-Bold.afm
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/fonts/Times-Bold.afm
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/fonts/Times-BoldItalic.afm b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/fonts/Times-BoldItalic.afm
similarity index 100%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/fonts/Times-BoldItalic.afm
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/fonts/Times-BoldItalic.afm
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/fonts/Times-Italic.afm b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/fonts/Times-Italic.afm
similarity index 100%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/fonts/Times-Italic.afm
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/fonts/Times-Italic.afm
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/fonts/Times-Roman.afm b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/fonts/Times-Roman.afm
similarity index 100%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/fonts/Times-Roman.afm
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/fonts/Times-Roman.afm
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/fonts/ZapfDingbats.afm b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/fonts/ZapfDingbats.afm
similarity index 100%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/fonts/ZapfDingbats.afm
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/fonts/ZapfDingbats.afm
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/fonts/cmap_info.txt b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/fonts/cmap_info.txt
similarity index 100%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/fonts/cmap_info.txt
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/fonts/cmap_info.txt
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/fonts/cmaps/CMap.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/fonts/cmaps/CMap.java
similarity index 98%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/fonts/cmaps/CMap.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/fonts/cmaps/CMap.java
index 66c948673..4b7040c4e 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/fonts/cmaps/CMap.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/fonts/cmaps/CMap.java
@@ -28,7 +28,7 @@
  * http://www.fontbox.org
  *
  */
-package com.third.v2.lowagie.text.pdf.fonts.cmaps;
+package com.fr.third.v2.lowagie.text.pdf.fonts.cmaps;
 
 import java.io.IOException;
 
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/fonts/cmaps/CMapParser.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/fonts/cmaps/CMapParser.java
similarity index 99%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/fonts/cmaps/CMapParser.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/fonts/cmaps/CMapParser.java
index 3ed45e5a1..badb045a0 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/fonts/cmaps/CMapParser.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/fonts/cmaps/CMapParser.java
@@ -28,7 +28,7 @@
  * http://www.fontbox.org
  *
  */
-package com.third.v2.lowagie.text.pdf.fonts.cmaps;
+package com.fr.third.v2.lowagie.text.pdf.fonts.cmaps;
 
 import java.io.FileInputStream;
 import java.io.InputStream;
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/fonts/cmaps/CodespaceRange.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/fonts/cmaps/CodespaceRange.java
similarity index 97%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/fonts/cmaps/CodespaceRange.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/fonts/cmaps/CodespaceRange.java
index b9a354e23..db44db03e 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/fonts/cmaps/CodespaceRange.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/fonts/cmaps/CodespaceRange.java
@@ -28,7 +28,7 @@
  * http://www.fontbox.org
  *
  */
-package com.third.v2.lowagie.text.pdf.fonts.cmaps;
+package com.fr.third.v2.lowagie.text.pdf.fonts.cmaps;
 
 /**
  * This represents a single entry in the codespace range.
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/fonts/glyphlist.txt b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/fonts/glyphlist.txt
similarity index 100%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/fonts/glyphlist.txt
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/fonts/glyphlist.txt
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/fonts/mustRead.html b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/fonts/mustRead.html
similarity index 100%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/fonts/mustRead.html
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/fonts/mustRead.html
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/hyphenation/ByteVector.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/hyphenation/ByteVector.java
similarity index 98%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/hyphenation/ByteVector.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/hyphenation/ByteVector.java
index 3de943bcf..15eb06975 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/hyphenation/ByteVector.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/hyphenation/ByteVector.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.third.v2.lowagie.text.pdf.hyphenation;
+package com.fr.third.v2.lowagie.text.pdf.hyphenation;
 
 import java.io.Serializable;
 
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/hyphenation/CharVector.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/hyphenation/CharVector.java
similarity index 98%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/hyphenation/CharVector.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/hyphenation/CharVector.java
index ad9c44799..fc77f28cd 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/hyphenation/CharVector.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/hyphenation/CharVector.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.third.v2.lowagie.text.pdf.hyphenation;
+package com.fr.third.v2.lowagie.text.pdf.hyphenation;
 
 import java.io.Serializable;
 
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/hyphenation/Hyphen.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/hyphenation/Hyphen.java
similarity index 97%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/hyphenation/Hyphen.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/hyphenation/Hyphen.java
index 2f7fcb2ea..1f97aa050 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/hyphenation/Hyphen.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/hyphenation/Hyphen.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.third.v2.lowagie.text.pdf.hyphenation;
+package com.fr.third.v2.lowagie.text.pdf.hyphenation;
 
 import java.io.Serializable;
 
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/hyphenation/Hyphenation.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/hyphenation/Hyphenation.java
similarity index 97%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/hyphenation/Hyphenation.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/hyphenation/Hyphenation.java
index 3198dfc1d..e47377806 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/hyphenation/Hyphenation.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/hyphenation/Hyphenation.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.third.v2.lowagie.text.pdf.hyphenation;
+package com.fr.third.v2.lowagie.text.pdf.hyphenation;
 
 /**
  * This class represents a hyphenated word.
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/hyphenation/HyphenationException.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/hyphenation/HyphenationException.java
similarity index 94%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/hyphenation/HyphenationException.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/hyphenation/HyphenationException.java
index cd56c6db2..61f5acabd 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/hyphenation/HyphenationException.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/hyphenation/HyphenationException.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.third.v2.lowagie.text.pdf.hyphenation;
+package com.fr.third.v2.lowagie.text.pdf.hyphenation;
 
 /**
  * @author Carlos Villegas 
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/hyphenation/HyphenationTree.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/hyphenation/HyphenationTree.java
similarity index 99%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/hyphenation/HyphenationTree.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/hyphenation/HyphenationTree.java
index e3aeb4ce1..a3a2fc5e1 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/hyphenation/HyphenationTree.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/hyphenation/HyphenationTree.java
@@ -16,7 +16,7 @@
 
 /* $Id: HyphenationTree.java 3117 2008-01-31 05:53:22Z xlv $ */
  
-package com.third.v2.lowagie.text.pdf.hyphenation;
+package com.fr.third.v2.lowagie.text.pdf.hyphenation;
 
 import java.io.InputStream;
 import java.util.ArrayList;
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/hyphenation/Hyphenator.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/hyphenation/Hyphenator.java
similarity index 97%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/hyphenation/Hyphenator.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/hyphenation/Hyphenator.java
index 7eee794a1..9e05bf355 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/hyphenation/Hyphenator.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/hyphenation/Hyphenator.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.third.v2.lowagie.text.pdf.hyphenation;
+package com.fr.third.v2.lowagie.text.pdf.hyphenation;
 
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.InputStream;
 import java.util.Hashtable;
 
-import com.third.v2.lowagie.text.pdf.BaseFont;
+import com.fr.third.v2.lowagie.text.pdf.BaseFont;
 
 /**
  * This class is the main entry point to the hyphenation package.
@@ -37,7 +37,7 @@ public class Hyphenator {
     private HyphenationTree hyphenTree = null;
     private int remainCharCount = 2;
     private int pushCharCount = 2;
-    private static final String defaultHyphLocation = "com/third/v2/text/pdf/hyphenation/hyph/";
+    private static final String defaultHyphLocation = "com/fr/third/v2/text/pdf/hyphenation/hyph/";
    
     /** Holds value of property hyphenDir. */
     private static String hyphenDir = "";    
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/hyphenation/PatternConsumer.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/hyphenation/PatternConsumer.java
similarity index 96%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/hyphenation/PatternConsumer.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/hyphenation/PatternConsumer.java
index 1bce363b8..dd6a40849 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/hyphenation/PatternConsumer.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/hyphenation/PatternConsumer.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.third.v2.lowagie.text.pdf.hyphenation;
+package com.fr.third.v2.lowagie.text.pdf.hyphenation;
 
 import java.util.ArrayList;
 
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/hyphenation/SimplePatternParser.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/hyphenation/SimplePatternParser.java
similarity index 96%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/hyphenation/SimplePatternParser.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/hyphenation/SimplePatternParser.java
index ac2ab605a..87ea5455a 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/hyphenation/SimplePatternParser.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/hyphenation/SimplePatternParser.java
@@ -48,7 +48,7 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf.hyphenation;
+package com.fr.third.v2.lowagie.text.pdf.hyphenation;
 
 import java.io.FileInputStream;
 import java.io.IOException;
@@ -56,10 +56,10 @@ import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.StringTokenizer;
 
-import com.third.v2.lowagie.text.ExceptionConverter;
-import com.third.v2.lowagie.text.html.HtmlTags;
-import com.third.v2.lowagie.text.xml.simpleparser.SimpleXMLDocHandler;
-import com.third.v2.lowagie.text.xml.simpleparser.SimpleXMLParser;
+import com.fr.third.v2.lowagie.text.ExceptionConverter;
+import com.fr.third.v2.lowagie.text.html.HtmlTags;
+import com.fr.third.v2.lowagie.text.xml.simpleparser.SimpleXMLParser;
+import com.fr.third.v2.lowagie.text.xml.simpleparser.SimpleXMLDocHandler;
 
 /** Parses the xml hyphenation pattern.
  *
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/hyphenation/TernaryTree.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/hyphenation/TernaryTree.java
similarity index 99%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/hyphenation/TernaryTree.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/hyphenation/TernaryTree.java
index 21e6e4ede..e92b24443 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/hyphenation/TernaryTree.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/hyphenation/TernaryTree.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.third.v2.lowagie.text.pdf.hyphenation;
+package com.fr.third.v2.lowagie.text.pdf.hyphenation;
 
 import java.io.Serializable;
 import java.util.Enumeration;
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/interfaces/PdfAnnotations.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/interfaces/PdfAnnotations.java
similarity index 94%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/interfaces/PdfAnnotations.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/interfaces/PdfAnnotations.java
index 5eed3bb46..d321936db 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/interfaces/PdfAnnotations.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/interfaces/PdfAnnotations.java
@@ -47,11 +47,11 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf.interfaces;
+package com.fr.third.v2.lowagie.text.pdf.interfaces;
 
-import com.third.v2.lowagie.text.pdf.PdfAcroForm;
-import com.third.v2.lowagie.text.pdf.PdfAnnotation;
-import com.third.v2.lowagie.text.pdf.PdfFormField;
+import com.fr.third.v2.lowagie.text.pdf.PdfAcroForm;
+import com.fr.third.v2.lowagie.text.pdf.PdfAnnotation;
+import com.fr.third.v2.lowagie.text.pdf.PdfFormField;
 
 public interface PdfAnnotations {
 
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/interfaces/PdfDocumentActions.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/interfaces/PdfDocumentActions.java
similarity index 94%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/interfaces/PdfDocumentActions.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/interfaces/PdfDocumentActions.java
index 7041ba7dd..67cce05b2 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/interfaces/PdfDocumentActions.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/interfaces/PdfDocumentActions.java
@@ -47,11 +47,11 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf.interfaces;
+package com.fr.third.v2.lowagie.text.pdf.interfaces;
 
-import com.third.v2.lowagie.text.DocumentException;
-import com.third.v2.lowagie.text.pdf.PdfAction;
-import com.third.v2.lowagie.text.pdf.PdfName;
+import com.fr.third.v2.lowagie.text.pdf.PdfAction;
+import com.fr.third.v2.lowagie.text.pdf.PdfName;
+import com.fr.third.v2.lowagie.text.DocumentException;
 
 /**
  * A PDF document can have an open action and other additional actions.
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/interfaces/PdfEncryptionSettings.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/interfaces/PdfEncryptionSettings.java
similarity index 97%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/interfaces/PdfEncryptionSettings.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/interfaces/PdfEncryptionSettings.java
index 743ec84bb..d5f0792b0 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/interfaces/PdfEncryptionSettings.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/interfaces/PdfEncryptionSettings.java
@@ -47,11 +47,11 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf.interfaces;
+package com.fr.third.v2.lowagie.text.pdf.interfaces;
 
 import java.security.cert.Certificate;
 
-import com.third.v2.lowagie.text.DocumentException;
+import com.fr.third.v2.lowagie.text.DocumentException;
 
 /**
  * Encryption settings are described in section 3.5 (more specifically
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/interfaces/PdfPageActions.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/interfaces/PdfPageActions.java
similarity index 92%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/interfaces/PdfPageActions.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/interfaces/PdfPageActions.java
index 4fb78c2a7..283dbd9bb 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/interfaces/PdfPageActions.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/interfaces/PdfPageActions.java
@@ -47,12 +47,12 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf.interfaces;
+package com.fr.third.v2.lowagie.text.pdf.interfaces;
 
-import com.third.v2.lowagie.text.DocumentException;
-import com.third.v2.lowagie.text.pdf.PdfAction;
-import com.third.v2.lowagie.text.pdf.PdfName;
-import com.third.v2.lowagie.text.pdf.PdfTransition;
+import com.fr.third.v2.lowagie.text.pdf.PdfAction;
+import com.fr.third.v2.lowagie.text.pdf.PdfName;
+import com.fr.third.v2.lowagie.text.DocumentException;
+import com.fr.third.v2.lowagie.text.pdf.PdfTransition;
 
 /**
  * A PDF page can have an open and/or close action.
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/interfaces/PdfRunDirection.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/interfaces/PdfRunDirection.java
similarity index 98%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/interfaces/PdfRunDirection.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/interfaces/PdfRunDirection.java
index 56cca1e4f..7f9645552 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/interfaces/PdfRunDirection.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/interfaces/PdfRunDirection.java
@@ -47,7 +47,7 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf.interfaces;
+package com.fr.third.v2.lowagie.text.pdf.interfaces;
 
 public interface PdfRunDirection {
     
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/interfaces/PdfVersion.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/interfaces/PdfVersion.java
similarity index 96%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/interfaces/PdfVersion.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/interfaces/PdfVersion.java
index 1044837eb..9641f8c28 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/interfaces/PdfVersion.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/interfaces/PdfVersion.java
@@ -47,10 +47,10 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf.interfaces;
+package com.fr.third.v2.lowagie.text.pdf.interfaces;
 
-import com.third.v2.lowagie.text.pdf.PdfDeveloperExtension;
-import com.third.v2.lowagie.text.pdf.PdfName;
+import com.fr.third.v2.lowagie.text.pdf.PdfDeveloperExtension;
+import com.fr.third.v2.lowagie.text.pdf.PdfName;
 
 /**
  * The PDF version is described in the PDF Reference 1.7 p92
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/interfaces/PdfViewerPreferences.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/interfaces/PdfViewerPreferences.java
similarity index 98%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/interfaces/PdfViewerPreferences.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/interfaces/PdfViewerPreferences.java
index 8cfa1fdd8..16615ee57 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/interfaces/PdfViewerPreferences.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/interfaces/PdfViewerPreferences.java
@@ -47,10 +47,10 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf.interfaces;
+package com.fr.third.v2.lowagie.text.pdf.interfaces;
 
-import com.third.v2.lowagie.text.pdf.PdfName;
-import com.third.v2.lowagie.text.pdf.PdfObject;
+import com.fr.third.v2.lowagie.text.pdf.PdfName;
+import com.fr.third.v2.lowagie.text.pdf.PdfObject;
 
 /**
  * Viewer preferences are described in section 3.6.1 and 8.1 of the
@@ -196,5 +196,5 @@ public interface PdfViewerPreferences {
      * @param value	the value of the viewer preference
 	 * @see PdfViewerPreferences#setViewerPreferences
      */
-    public void addViewerPreference(PdfName key, PdfObject value);
+    public void addViewerPreference(PdfName key, PdfObject value);    	
 }
\ No newline at end of file
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/interfaces/PdfXConformance.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/interfaces/PdfXConformance.java
similarity index 98%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/interfaces/PdfXConformance.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/interfaces/PdfXConformance.java
index 3a9911619..5526294b9 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/interfaces/PdfXConformance.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/interfaces/PdfXConformance.java
@@ -47,7 +47,7 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf.interfaces;
+package com.fr.third.v2.lowagie.text.pdf.interfaces;
 
 public interface PdfXConformance {
     
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/internal/PdfAnnotationsImp.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/internal/PdfAnnotationsImp.java
similarity index 92%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/internal/PdfAnnotationsImp.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/internal/PdfAnnotationsImp.java
index 8a8944bc9..5927276ef 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/internal/PdfAnnotationsImp.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/internal/PdfAnnotationsImp.java
@@ -47,27 +47,27 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf.internal;
+package com.fr.third.v2.lowagie.text.pdf.internal;
 
 import java.io.IOException;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.HashMap;
 
-import com.third.v2.lowagie.text.Annotation;
-import com.third.v2.lowagie.text.ExceptionConverter;
-import com.third.v2.lowagie.text.Rectangle;
-import com.third.v2.lowagie.text.pdf.PdfAcroForm;
-import com.third.v2.lowagie.text.pdf.PdfAction;
-import com.third.v2.lowagie.text.pdf.PdfAnnotation;
-import com.third.v2.lowagie.text.pdf.PdfArray;
-import com.third.v2.lowagie.text.pdf.PdfFileSpecification;
-import com.third.v2.lowagie.text.pdf.PdfFormField;
-import com.third.v2.lowagie.text.pdf.PdfName;
-import com.third.v2.lowagie.text.pdf.PdfObject;
-import com.third.v2.lowagie.text.pdf.PdfRectangle;
-import com.third.v2.lowagie.text.pdf.PdfString;
-import com.third.v2.lowagie.text.pdf.PdfWriter;
+import com.fr.third.v2.lowagie.text.Annotation;
+import com.fr.third.v2.lowagie.text.ExceptionConverter;
+import com.fr.third.v2.lowagie.text.pdf.PdfAcroForm;
+import com.fr.third.v2.lowagie.text.pdf.PdfAction;
+import com.fr.third.v2.lowagie.text.pdf.PdfFileSpecification;
+import com.fr.third.v2.lowagie.text.pdf.PdfName;
+import com.fr.third.v2.lowagie.text.Rectangle;
+import com.fr.third.v2.lowagie.text.pdf.PdfAnnotation;
+import com.fr.third.v2.lowagie.text.pdf.PdfArray;
+import com.fr.third.v2.lowagie.text.pdf.PdfFormField;
+import com.fr.third.v2.lowagie.text.pdf.PdfObject;
+import com.fr.third.v2.lowagie.text.pdf.PdfRectangle;
+import com.fr.third.v2.lowagie.text.pdf.PdfString;
+import com.fr.third.v2.lowagie.text.pdf.PdfWriter;
 
 public class PdfAnnotationsImp {
 
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/internal/PdfVersionImp.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/internal/PdfVersionImp.java
similarity index 93%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/internal/PdfVersionImp.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/internal/PdfVersionImp.java
index d92b1f903..87c572506 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/internal/PdfVersionImp.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/internal/PdfVersionImp.java
@@ -47,17 +47,17 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf.internal;
+package com.fr.third.v2.lowagie.text.pdf.internal;
 
 import java.io.IOException;
 
-import com.third.v2.lowagie.text.DocWriter;
-import com.third.v2.lowagie.text.pdf.OutputStreamCounter;
-import com.third.v2.lowagie.text.pdf.PdfDeveloperExtension;
-import com.third.v2.lowagie.text.pdf.PdfDictionary;
-import com.third.v2.lowagie.text.pdf.PdfName;
-import com.third.v2.lowagie.text.pdf.PdfWriter;
-import com.third.v2.lowagie.text.pdf.interfaces.PdfVersion;
+import com.fr.third.v2.lowagie.text.pdf.PdfDeveloperExtension;
+import com.fr.third.v2.lowagie.text.pdf.PdfName;
+import com.fr.third.v2.lowagie.text.DocWriter;
+import com.fr.third.v2.lowagie.text.pdf.OutputStreamCounter;
+import com.fr.third.v2.lowagie.text.pdf.PdfDictionary;
+import com.fr.third.v2.lowagie.text.pdf.PdfWriter;
+import com.fr.third.v2.lowagie.text.pdf.interfaces.PdfVersion;
 
 /**
  * Stores the PDF version information,
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/internal/PdfViewerPreferencesImp.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/internal/PdfViewerPreferencesImp.java
similarity index 96%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/internal/PdfViewerPreferencesImp.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/internal/PdfViewerPreferencesImp.java
index 9a7268aba..dacb30bbe 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/internal/PdfViewerPreferencesImp.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/internal/PdfViewerPreferencesImp.java
@@ -47,17 +47,17 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf.internal;
+package com.fr.third.v2.lowagie.text.pdf.internal;
 
-import com.third.v2.lowagie.text.pdf.PdfArray;
-import com.third.v2.lowagie.text.pdf.PdfBoolean;
-import com.third.v2.lowagie.text.pdf.PdfDictionary;
-import com.third.v2.lowagie.text.pdf.PdfName;
-import com.third.v2.lowagie.text.pdf.PdfNumber;
-import com.third.v2.lowagie.text.pdf.PdfObject;
-import com.third.v2.lowagie.text.pdf.PdfReader;
-import com.third.v2.lowagie.text.pdf.PdfWriter;
-import com.third.v2.lowagie.text.pdf.interfaces.PdfViewerPreferences;
+import com.fr.third.v2.lowagie.text.pdf.PdfName;
+import com.fr.third.v2.lowagie.text.pdf.PdfNumber;
+import com.fr.third.v2.lowagie.text.pdf.interfaces.PdfViewerPreferences;
+import com.fr.third.v2.lowagie.text.pdf.PdfArray;
+import com.fr.third.v2.lowagie.text.pdf.PdfBoolean;
+import com.fr.third.v2.lowagie.text.pdf.PdfDictionary;
+import com.fr.third.v2.lowagie.text.pdf.PdfObject;
+import com.fr.third.v2.lowagie.text.pdf.PdfReader;
+import com.fr.third.v2.lowagie.text.pdf.PdfWriter;
 
 /**
  * Stores the information concerning viewer preferences,
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/internal/PdfXConformanceImp.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/internal/PdfXConformanceImp.java
similarity index 92%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/internal/PdfXConformanceImp.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/internal/PdfXConformanceImp.java
index cb6fbe808..b9ad91116 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/internal/PdfXConformanceImp.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/internal/PdfXConformanceImp.java
@@ -47,26 +47,26 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf.internal;
+package com.fr.third.v2.lowagie.text.pdf.internal;
 
 import java.awt.Color;
 
-import com.third.v2.lowagie.text.pdf.BaseFont;
-import com.third.v2.lowagie.text.pdf.ExtendedColor;
-import com.third.v2.lowagie.text.pdf.PatternColor;
-import com.third.v2.lowagie.text.pdf.PdfArray;
-import com.third.v2.lowagie.text.pdf.PdfDictionary;
-import com.third.v2.lowagie.text.pdf.PdfGState;
-import com.third.v2.lowagie.text.pdf.PdfImage;
-import com.third.v2.lowagie.text.pdf.PdfName;
-import com.third.v2.lowagie.text.pdf.PdfNumber;
-import com.third.v2.lowagie.text.pdf.PdfObject;
-import com.third.v2.lowagie.text.pdf.PdfString;
-import com.third.v2.lowagie.text.pdf.PdfWriter;
-import com.third.v2.lowagie.text.pdf.PdfXConformanceException;
-import com.third.v2.lowagie.text.pdf.ShadingColor;
-import com.third.v2.lowagie.text.pdf.SpotColor;
-import com.third.v2.lowagie.text.pdf.interfaces.PdfXConformance;
+import com.fr.third.v2.lowagie.text.pdf.PdfDictionary;
+import com.fr.third.v2.lowagie.text.pdf.PdfName;
+import com.fr.third.v2.lowagie.text.pdf.PdfNumber;
+import com.fr.third.v2.lowagie.text.pdf.PdfString;
+import com.fr.third.v2.lowagie.text.pdf.PdfXConformanceException;
+import com.fr.third.v2.lowagie.text.pdf.ShadingColor;
+import com.fr.third.v2.lowagie.text.pdf.SpotColor;
+import com.fr.third.v2.lowagie.text.pdf.BaseFont;
+import com.fr.third.v2.lowagie.text.pdf.ExtendedColor;
+import com.fr.third.v2.lowagie.text.pdf.PatternColor;
+import com.fr.third.v2.lowagie.text.pdf.PdfArray;
+import com.fr.third.v2.lowagie.text.pdf.PdfGState;
+import com.fr.third.v2.lowagie.text.pdf.PdfImage;
+import com.fr.third.v2.lowagie.text.pdf.PdfObject;
+import com.fr.third.v2.lowagie.text.pdf.PdfWriter;
+import com.fr.third.v2.lowagie.text.pdf.interfaces.PdfXConformance;
 
 public class PdfXConformanceImp implements PdfXConformance {
 
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/internal/PolylineShape.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/internal/PolylineShape.java
similarity index 99%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/internal/PolylineShape.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/internal/PolylineShape.java
index d5aaf8c6c..346e46d56 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/internal/PolylineShape.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/internal/PolylineShape.java
@@ -47,7 +47,7 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf.internal;
+package com.fr.third.v2.lowagie.text.pdf.internal;
 
 import java.awt.Shape;
 import java.awt.Rectangle;
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/internal/PolylineShapeIterator.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/internal/PolylineShapeIterator.java
similarity index 99%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/internal/PolylineShapeIterator.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/internal/PolylineShapeIterator.java
index e166c0173..895e46244 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/internal/PolylineShapeIterator.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/internal/PolylineShapeIterator.java
@@ -47,7 +47,7 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.pdf.internal;
+package com.fr.third.v2.lowagie.text.pdf.internal;
 
 import java.awt.geom.AffineTransform;
 import java.awt.geom.PathIterator;
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/parser/ContentOperator.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/parser/ContentOperator.java
similarity index 96%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/parser/ContentOperator.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/parser/ContentOperator.java
index 7c134c897..4e17c3e41 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/parser/ContentOperator.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/parser/ContentOperator.java
@@ -44,11 +44,11 @@
  * you aren't using an obsolete version:
  * http://www.lowagie.com/iText/
  */
-package com.third.v2.lowagie.text.pdf.parser;
+package com.fr.third.v2.lowagie.text.pdf.parser;
 
 import java.util.ArrayList;
 
-import com.third.v2.lowagie.text.pdf.PdfLiteral;
+import com.fr.third.v2.lowagie.text.pdf.PdfLiteral;
 
 /**
  * Interface implemented by a series of content operators
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/parser/GraphicsState.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/parser/GraphicsState.java
similarity index 97%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/parser/GraphicsState.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/parser/GraphicsState.java
index 19db79042..0d769eaed 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/parser/GraphicsState.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/parser/GraphicsState.java
@@ -44,9 +44,9 @@
  * you aren't using an obsolete version:
  * http://www.lowagie.com/iText/
  */
-package com.third.v2.lowagie.text.pdf.parser;
+package com.fr.third.v2.lowagie.text.pdf.parser;
 
-import com.third.v2.lowagie.text.pdf.CMapAwareDocumentFont;
+import com.fr.third.v2.lowagie.text.pdf.CMapAwareDocumentFont;
 
 /**
  * Keeps all the parameters of the graphics state.
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/parser/Matrix.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/parser/Matrix.java
similarity index 99%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/parser/Matrix.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/parser/Matrix.java
index 16b8496ae..6d2c410b2 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/parser/Matrix.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/parser/Matrix.java
@@ -44,7 +44,7 @@
  * you aren't using an obsolete version:
  * http://www.lowagie.com/iText/
  */
-package com.third.v2.lowagie.text.pdf.parser;
+package com.fr.third.v2.lowagie.text.pdf.parser;
 
 import java.util.Arrays;
 
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/parser/PdfContentReaderTool.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/parser/PdfContentReaderTool.java
similarity index 96%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/parser/PdfContentReaderTool.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/parser/PdfContentReaderTool.java
index e308027a4..fa3b0dd5e 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/parser/PdfContentReaderTool.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/parser/PdfContentReaderTool.java
@@ -44,7 +44,7 @@
  * you aren't using an obsolete version:
  * http://www.lowagie.com/iText/
  */
-package com.third.v2.lowagie.text.pdf.parser;
+package com.fr.third.v2.lowagie.text.pdf.parser;
 
 import java.io.ByteArrayInputStream;
 import java.io.File;
@@ -56,11 +56,11 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
-import com.third.v2.lowagie.text.pdf.PdfDictionary;
-import com.third.v2.lowagie.text.pdf.PdfName;
-import com.third.v2.lowagie.text.pdf.PdfObject;
-import com.third.v2.lowagie.text.pdf.PdfReader;
-import com.third.v2.lowagie.text.pdf.RandomAccessFileOrArray;
+import com.fr.third.v2.lowagie.text.pdf.PdfDictionary;
+import com.fr.third.v2.lowagie.text.pdf.PdfName;
+import com.fr.third.v2.lowagie.text.pdf.PdfObject;
+import com.fr.third.v2.lowagie.text.pdf.PdfReader;
+import com.fr.third.v2.lowagie.text.pdf.RandomAccessFileOrArray;
 
 /**
  * Tool that parses the content of a PDF document.
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/parser/PdfContentStreamProcessor.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/parser/PdfContentStreamProcessor.java
similarity index 96%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/parser/PdfContentStreamProcessor.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/parser/PdfContentStreamProcessor.java
index 5d6aecfc5..02fe84310 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/parser/PdfContentStreamProcessor.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/parser/PdfContentStreamProcessor.java
@@ -44,7 +44,7 @@
  * you aren't using an obsolete version:
  * http://www.lowagie.com/iText/
  */
-package com.third.v2.lowagie.text.pdf.parser;
+package com.fr.third.v2.lowagie.text.pdf.parser;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -52,18 +52,18 @@ import java.util.Iterator;
 import java.util.Map;
 import java.util.Stack;
 
-import com.third.v2.lowagie.text.ExceptionConverter;
-import com.third.v2.lowagie.text.pdf.CMapAwareDocumentFont;
-import com.third.v2.lowagie.text.pdf.DocumentFont;
-import com.third.v2.lowagie.text.pdf.PRIndirectReference;
-import com.third.v2.lowagie.text.pdf.PRTokeniser;
-import com.third.v2.lowagie.text.pdf.PdfArray;
-import com.third.v2.lowagie.text.pdf.PdfContentParser;
-import com.third.v2.lowagie.text.pdf.PdfDictionary;
-import com.third.v2.lowagie.text.pdf.PdfLiteral;
-import com.third.v2.lowagie.text.pdf.PdfName;
-import com.third.v2.lowagie.text.pdf.PdfNumber;
-import com.third.v2.lowagie.text.pdf.PdfString;
+import com.fr.third.v2.lowagie.text.ExceptionConverter;
+import com.fr.third.v2.lowagie.text.pdf.CMapAwareDocumentFont;
+import com.fr.third.v2.lowagie.text.pdf.DocumentFont;
+import com.fr.third.v2.lowagie.text.pdf.PRIndirectReference;
+import com.fr.third.v2.lowagie.text.pdf.PRTokeniser;
+import com.fr.third.v2.lowagie.text.pdf.PdfArray;
+import com.fr.third.v2.lowagie.text.pdf.PdfContentParser;
+import com.fr.third.v2.lowagie.text.pdf.PdfDictionary;
+import com.fr.third.v2.lowagie.text.pdf.PdfName;
+import com.fr.third.v2.lowagie.text.pdf.PdfNumber;
+import com.fr.third.v2.lowagie.text.pdf.PdfString;
+import com.fr.third.v2.lowagie.text.pdf.PdfLiteral;
 
 /**
  * Processor for a PDF content Stream.
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/parser/PdfTextExtractor.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/parser/PdfTextExtractor.java
similarity index 93%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/parser/PdfTextExtractor.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/parser/PdfTextExtractor.java
index 68f0e8f4a..95eca2bfe 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/parser/PdfTextExtractor.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/parser/PdfTextExtractor.java
@@ -44,14 +44,14 @@
  * you aren't using an obsolete version:
  * http://www.lowagie.com/iText/
  */
-package com.third.v2.lowagie.text.pdf.parser;
+package com.fr.third.v2.lowagie.text.pdf.parser;
 
 import java.io.IOException;
 
-import com.third.v2.lowagie.text.pdf.PdfDictionary;
-import com.third.v2.lowagie.text.pdf.PdfName;
-import com.third.v2.lowagie.text.pdf.PdfReader;
-import com.third.v2.lowagie.text.pdf.RandomAccessFileOrArray;
+import com.fr.third.v2.lowagie.text.pdf.PdfName;
+import com.fr.third.v2.lowagie.text.pdf.PdfDictionary;
+import com.fr.third.v2.lowagie.text.pdf.PdfReader;
+import com.fr.third.v2.lowagie.text.pdf.RandomAccessFileOrArray;
 
 /**
  * Extracts text from a PDF file.
diff --git a/fine-itext/src/com/third/v2/lowagie/text/pdf/parser/SimpleTextExtractingPdfContentStreamProcessor.java b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/parser/SimpleTextExtractingPdfContentStreamProcessor.java
similarity index 99%
rename from fine-itext/src/com/third/v2/lowagie/text/pdf/parser/SimpleTextExtractingPdfContentStreamProcessor.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/pdf/parser/SimpleTextExtractingPdfContentStreamProcessor.java
index 8c72cac51..5074f79ed 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/pdf/parser/SimpleTextExtractingPdfContentStreamProcessor.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/pdf/parser/SimpleTextExtractingPdfContentStreamProcessor.java
@@ -44,7 +44,7 @@
  * you aren't using an obsolete version:
  * http://www.lowagie.com/iText/
  */
-package com.third.v2.lowagie.text.pdf.parser;
+package com.fr.third.v2.lowagie.text.pdf.parser;
 
 /**
  * A simple text extraction processor.
diff --git a/fine-itext/src/com/third/v2/lowagie/text/xml/SAXiTextHandler.java b/fine-itext/src/com/fr/third/v2/lowagie/text/xml/SAXiTextHandler.java
similarity index 95%
rename from fine-itext/src/com/third/v2/lowagie/text/xml/SAXiTextHandler.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/xml/SAXiTextHandler.java
index 1be760298..484527486 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/xml/SAXiTextHandler.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/xml/SAXiTextHandler.java
@@ -47,7 +47,7 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.xml;
+package com.fr.third.v2.lowagie.text.xml;
 
 import java.lang.reflect.Field;
 import java.util.ArrayList;
@@ -58,36 +58,36 @@ import java.util.Iterator;
 import java.util.Properties;
 import java.util.Stack;
 
-import com.third.v2.lowagie.text.Anchor;
-import com.third.v2.lowagie.text.Annotation;
-import com.third.v2.lowagie.text.BadElementException;
-import com.third.v2.lowagie.text.Chapter;
-import com.third.v2.lowagie.text.Chunk;
-import com.third.v2.lowagie.text.DocListener;
-import com.third.v2.lowagie.text.DocumentException;
-import com.third.v2.lowagie.text.Element;
-import com.third.v2.lowagie.text.ElementTags;
-import com.third.v2.lowagie.text.ExceptionConverter;
-import com.third.v2.lowagie.text.Font;
-import com.third.v2.lowagie.text.Image;
-import com.third.v2.lowagie.text.List;
-import com.third.v2.lowagie.text.ListItem;
-import com.third.v2.lowagie.text.Meta;
-import com.third.v2.lowagie.text.PageSize;
-import com.third.v2.lowagie.text.Paragraph;
-import com.third.v2.lowagie.text.Rectangle;
-import com.third.v2.lowagie.text.Section;
-import com.third.v2.lowagie.text.Table;
-import com.third.v2.lowagie.text.TextElementArray;
-import com.third.v2.lowagie.text.factories.ElementFactory;
-import com.third.v2.lowagie.text.html.HtmlTagMap;
-import com.third.v2.lowagie.text.pdf.draw.LineSeparator;
-import com.third.v2.lowagie.text.xml.simpleparser.EntitiesToSymbol;
 import org.xml.sax.Attributes;
 import org.xml.sax.helpers.DefaultHandler;
 
-import com.third.v2.lowagie.text.Cell;
-import com.third.v2.lowagie.text.pdf.BaseFont;
+import com.fr.third.v2.lowagie.text.Anchor;
+import com.fr.third.v2.lowagie.text.Annotation;
+import com.fr.third.v2.lowagie.text.BadElementException;
+import com.fr.third.v2.lowagie.text.Cell;
+import com.fr.third.v2.lowagie.text.Chapter;
+import com.fr.third.v2.lowagie.text.Chunk;
+import com.fr.third.v2.lowagie.text.DocListener;
+import com.fr.third.v2.lowagie.text.DocumentException;
+import com.fr.third.v2.lowagie.text.Element;
+import com.fr.third.v2.lowagie.text.ElementTags;
+import com.fr.third.v2.lowagie.text.ExceptionConverter;
+import com.fr.third.v2.lowagie.text.Font;
+import com.fr.third.v2.lowagie.text.Image;
+import com.fr.third.v2.lowagie.text.List;
+import com.fr.third.v2.lowagie.text.ListItem;
+import com.fr.third.v2.lowagie.text.Meta;
+import com.fr.third.v2.lowagie.text.PageSize;
+import com.fr.third.v2.lowagie.text.Paragraph;
+import com.fr.third.v2.lowagie.text.Rectangle;
+import com.fr.third.v2.lowagie.text.Section;
+import com.fr.third.v2.lowagie.text.Table;
+import com.fr.third.v2.lowagie.text.TextElementArray;
+import com.fr.third.v2.lowagie.text.factories.ElementFactory;
+import com.fr.third.v2.lowagie.text.html.HtmlTagMap;
+import com.fr.third.v2.lowagie.text.pdf.BaseFont;
+import com.fr.third.v2.lowagie.text.pdf.draw.LineSeparator;
+import com.fr.third.v2.lowagie.text.xml.simpleparser.EntitiesToSymbol;
 
 /**
  * This class is a Handler that controls the iText XML to PDF conversion.
diff --git a/fine-itext/src/com/third/v2/lowagie/text/xml/SAXmyHandler.java b/fine-itext/src/com/fr/third/v2/lowagie/text/xml/SAXmyHandler.java
similarity index 98%
rename from fine-itext/src/com/third/v2/lowagie/text/xml/SAXmyHandler.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/xml/SAXmyHandler.java
index 9164f62fc..b7007ed78 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/xml/SAXmyHandler.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/xml/SAXmyHandler.java
@@ -47,14 +47,14 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.xml;
+package com.fr.third.v2.lowagie.text.xml;
 
 import java.util.HashMap;
 import java.util.Properties;
 
 import org.xml.sax.Attributes;
 
-import com.third.v2.lowagie.text.DocListener;
+import com.fr.third.v2.lowagie.text.DocListener;
 
 /**
  * The Tags-class maps several XHTML-tags to iText-objects.
diff --git a/fine-itext/src/com/third/v2/lowagie/text/xml/TagMap.java b/fine-itext/src/com/fr/third/v2/lowagie/text/xml/TagMap.java
similarity index 98%
rename from fine-itext/src/com/third/v2/lowagie/text/xml/TagMap.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/xml/TagMap.java
index 4f473fa54..269ad5ef9 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/xml/TagMap.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/xml/TagMap.java
@@ -47,7 +47,7 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.xml;
+package com.fr.third.v2.lowagie.text.xml;
 
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
@@ -57,7 +57,7 @@ import java.util.HashMap;
 import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;
 
-import com.third.v2.lowagie.text.ExceptionConverter;
+import com.fr.third.v2.lowagie.text.ExceptionConverter;
 import org.xml.sax.Attributes;
 import org.xml.sax.InputSource;
 import org.xml.sax.helpers.DefaultHandler;
diff --git a/fine-itext/src/com/third/v2/lowagie/text/xml/XmlDomWriter.java b/fine-itext/src/com/fr/third/v2/lowagie/text/xml/XmlDomWriter.java
similarity index 99%
rename from fine-itext/src/com/third/v2/lowagie/text/xml/XmlDomWriter.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/xml/XmlDomWriter.java
index 704d32c18..472a5843d 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/xml/XmlDomWriter.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/xml/XmlDomWriter.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.third.v2.lowagie.text.xml;
+package com.fr.third.v2.lowagie.text.xml;
 
 import java.io.OutputStream;
 import java.io.OutputStreamWriter;
diff --git a/fine-itext/src/com/third/v2/lowagie/text/xml/XmlParser.java b/fine-itext/src/com/fr/third/v2/lowagie/text/xml/XmlParser.java
similarity index 98%
rename from fine-itext/src/com/third/v2/lowagie/text/xml/XmlParser.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/xml/XmlParser.java
index 06d61ecea..c348a70b3 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/xml/XmlParser.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/xml/XmlParser.java
@@ -47,7 +47,7 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.xml;
+package com.fr.third.v2.lowagie.text.xml;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -58,11 +58,11 @@ import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;
 
+import com.fr.third.v2.lowagie.text.ExceptionConverter;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
 
-import com.third.v2.lowagie.text.DocListener;
-import com.third.v2.lowagie.text.ExceptionConverter;
+import com.fr.third.v2.lowagie.text.DocListener;
 
 /**
  * This class can be used to parse an XML file.
diff --git a/fine-itext/src/com/third/v2/lowagie/text/xml/XmlPeer.java b/fine-itext/src/com/fr/third/v2/lowagie/text/xml/XmlPeer.java
similarity index 98%
rename from fine-itext/src/com/third/v2/lowagie/text/xml/XmlPeer.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/xml/XmlPeer.java
index 8e96d22d5..736ab8773 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/xml/XmlPeer.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/xml/XmlPeer.java
@@ -47,13 +47,14 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.xml;
+package com.fr.third.v2.lowagie.text.xml;
 
 import java.util.Properties;
 
-import com.third.v2.lowagie.text.ElementTags;
 import org.xml.sax.Attributes;
 
+import com.fr.third.v2.lowagie.text.ElementTags;
+
 /**
  * This interface is implemented by the peer of all the iText objects.
  */
diff --git a/fine-itext/src/com/third/v2/lowagie/text/xml/simpleparser/EntitiesToSymbol.java b/fine-itext/src/com/fr/third/v2/lowagie/text/xml/simpleparser/EntitiesToSymbol.java
similarity index 99%
rename from fine-itext/src/com/third/v2/lowagie/text/xml/simpleparser/EntitiesToSymbol.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/xml/simpleparser/EntitiesToSymbol.java
index f341993fe..142c4a56a 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/xml/simpleparser/EntitiesToSymbol.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/xml/simpleparser/EntitiesToSymbol.java
@@ -47,12 +47,12 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.xml.simpleparser;
+package com.fr.third.v2.lowagie.text.xml.simpleparser;
 
 import java.util.HashMap;
 
-import com.third.v2.lowagie.text.Chunk;
-import com.third.v2.lowagie.text.Font;
+import com.fr.third.v2.lowagie.text.Font;
+import com.fr.third.v2.lowagie.text.Chunk;
 
 /**
  * This class contains entities that can be used in an entity tag.
diff --git a/fine-itext/src/com/third/v2/lowagie/text/xml/simpleparser/EntitiesToUnicode.java b/fine-itext/src/com/fr/third/v2/lowagie/text/xml/simpleparser/EntitiesToUnicode.java
similarity index 99%
rename from fine-itext/src/com/third/v2/lowagie/text/xml/simpleparser/EntitiesToUnicode.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/xml/simpleparser/EntitiesToUnicode.java
index e24551722..6c983f5bd 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/xml/simpleparser/EntitiesToUnicode.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/xml/simpleparser/EntitiesToUnicode.java
@@ -47,7 +47,7 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.xml.simpleparser;
+package com.fr.third.v2.lowagie.text.xml.simpleparser;
 
 import java.util.HashMap;
 
diff --git a/fine-itext/src/com/third/v2/lowagie/text/xml/simpleparser/IanaEncodings.java b/fine-itext/src/com/fr/third/v2/lowagie/text/xml/simpleparser/IanaEncodings.java
similarity index 99%
rename from fine-itext/src/com/third/v2/lowagie/text/xml/simpleparser/IanaEncodings.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/xml/simpleparser/IanaEncodings.java
index 3024b29ef..fa1dd5039 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/xml/simpleparser/IanaEncodings.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/xml/simpleparser/IanaEncodings.java
@@ -65,7 +65,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.third.v2.lowagie.text.xml.simpleparser;
+package com.fr.third.v2.lowagie.text.xml.simpleparser;
 
 import java.util.HashMap;
 
diff --git a/fine-itext/src/com/third/v2/lowagie/text/xml/simpleparser/SimpleXMLDocHandler.java b/fine-itext/src/com/fr/third/v2/lowagie/text/xml/simpleparser/SimpleXMLDocHandler.java
similarity index 98%
rename from fine-itext/src/com/third/v2/lowagie/text/xml/simpleparser/SimpleXMLDocHandler.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/xml/simpleparser/SimpleXMLDocHandler.java
index cc271916c..ae4846555 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/xml/simpleparser/SimpleXMLDocHandler.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/xml/simpleparser/SimpleXMLDocHandler.java
@@ -44,7 +44,7 @@
  * you aren't using an obsolete version:
  * http://www.lowagie.com/iText/
  */
-package com.third.v2.lowagie.text.xml.simpleparser;
+package com.fr.third.v2.lowagie.text.xml.simpleparser;
 
 import java.util.HashMap;
 
diff --git a/fine-itext/src/com/third/v2/lowagie/text/xml/simpleparser/SimpleXMLDocHandlerComment.java b/fine-itext/src/com/fr/third/v2/lowagie/text/xml/simpleparser/SimpleXMLDocHandlerComment.java
similarity index 97%
rename from fine-itext/src/com/third/v2/lowagie/text/xml/simpleparser/SimpleXMLDocHandlerComment.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/xml/simpleparser/SimpleXMLDocHandlerComment.java
index 46a6fb8e1..4c721f7a9 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/xml/simpleparser/SimpleXMLDocHandlerComment.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/xml/simpleparser/SimpleXMLDocHandlerComment.java
@@ -44,7 +44,7 @@
  * you aren't using an obsolete version:
  * http://www.lowagie.com/iText/
  */
-package com.third.v2.lowagie.text.xml.simpleparser;
+package com.fr.third.v2.lowagie.text.xml.simpleparser;
 
 /**
  * The handler for the events fired by SimpleXMLParser.
diff --git a/fine-itext/src/com/third/v2/lowagie/text/xml/simpleparser/SimpleXMLParser.java b/fine-itext/src/com/fr/third/v2/lowagie/text/xml/simpleparser/SimpleXMLParser.java
similarity index 99%
rename from fine-itext/src/com/third/v2/lowagie/text/xml/simpleparser/SimpleXMLParser.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/xml/simpleparser/SimpleXMLParser.java
index 6f4b39127..b1a765d31 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/xml/simpleparser/SimpleXMLParser.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/xml/simpleparser/SimpleXMLParser.java
@@ -73,7 +73,7 @@
  * Apache Software Foundation under the Apache Software License; now being
  * used in iText under the MPL.
  */
-package com.third.v2.lowagie.text.xml.simpleparser;
+package com.fr.third.v2.lowagie.text.xml.simpleparser;
 
 import java.io.BufferedReader;
 import java.io.ByteArrayOutputStream;
diff --git a/fine-itext/src/com/third/v2/lowagie/text/xml/xmp/DublinCoreSchema.java b/fine-itext/src/com/fr/third/v2/lowagie/text/xml/xmp/DublinCoreSchema.java
similarity index 99%
rename from fine-itext/src/com/third/v2/lowagie/text/xml/xmp/DublinCoreSchema.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/xml/xmp/DublinCoreSchema.java
index 0e780f91c..3f6c4a03a 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/xml/xmp/DublinCoreSchema.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/xml/xmp/DublinCoreSchema.java
@@ -47,7 +47,7 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.xml.xmp;
+package com.fr.third.v2.lowagie.text.xml.xmp;
 
 
 /**
diff --git a/fine-itext/src/com/third/v2/lowagie/text/xml/xmp/LangAlt.java b/fine-itext/src/com/fr/third/v2/lowagie/text/xml/xmp/LangAlt.java
similarity index 98%
rename from fine-itext/src/com/third/v2/lowagie/text/xml/xmp/LangAlt.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/xml/xmp/LangAlt.java
index dfb96dcae..572b30a34 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/xml/xmp/LangAlt.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/xml/xmp/LangAlt.java
@@ -47,7 +47,7 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.xml.xmp;
+package com.fr.third.v2.lowagie.text.xml.xmp;
 
 import java.util.Enumeration;
 import java.util.Properties;
diff --git a/fine-itext/src/com/third/v2/lowagie/text/xml/xmp/PdfA1Schema.java b/fine-itext/src/com/fr/third/v2/lowagie/text/xml/xmp/PdfA1Schema.java
similarity index 98%
rename from fine-itext/src/com/third/v2/lowagie/text/xml/xmp/PdfA1Schema.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/xml/xmp/PdfA1Schema.java
index 2c635d7be..4b6023757 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/xml/xmp/PdfA1Schema.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/xml/xmp/PdfA1Schema.java
@@ -47,7 +47,7 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.xml.xmp;
+package com.fr.third.v2.lowagie.text.xml.xmp;
 
 /**
  * An implementation of an XmpSchema.
diff --git a/fine-itext/src/com/third/v2/lowagie/text/xml/xmp/PdfSchema.java b/fine-itext/src/com/fr/third/v2/lowagie/text/xml/xmp/PdfSchema.java
similarity index 97%
rename from fine-itext/src/com/third/v2/lowagie/text/xml/xmp/PdfSchema.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/xml/xmp/PdfSchema.java
index 7e4464dbd..7a87d8715 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/xml/xmp/PdfSchema.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/xml/xmp/PdfSchema.java
@@ -47,9 +47,9 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.xml.xmp;
+package com.fr.third.v2.lowagie.text.xml.xmp;
 
-import com.third.v2.lowagie.text.Document;
+import com.fr.third.v2.lowagie.text.Document;
 
 /**
  * An implementation of an XmpSchema.
diff --git a/fine-itext/src/com/third/v2/lowagie/text/xml/xmp/XmpArray.java b/fine-itext/src/com/fr/third/v2/lowagie/text/xml/xmp/XmpArray.java
similarity index 98%
rename from fine-itext/src/com/third/v2/lowagie/text/xml/xmp/XmpArray.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/xml/xmp/XmpArray.java
index 9ee4911d3..540ce7236 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/xml/xmp/XmpArray.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/xml/xmp/XmpArray.java
@@ -47,7 +47,7 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.xml.xmp;
+package com.fr.third.v2.lowagie.text.xml.xmp;
 
 import java.util.ArrayList;
 import java.util.Iterator;
diff --git a/fine-itext/src/com/third/v2/lowagie/text/xml/xmp/XmpBasicSchema.java b/fine-itext/src/com/fr/third/v2/lowagie/text/xml/xmp/XmpBasicSchema.java
similarity index 99%
rename from fine-itext/src/com/third/v2/lowagie/text/xml/xmp/XmpBasicSchema.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/xml/xmp/XmpBasicSchema.java
index 2eba9dbb8..806141556 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/xml/xmp/XmpBasicSchema.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/xml/xmp/XmpBasicSchema.java
@@ -47,7 +47,7 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.xml.xmp;
+package com.fr.third.v2.lowagie.text.xml.xmp;
 
 
 /**
diff --git a/fine-itext/src/com/third/v2/lowagie/text/xml/xmp/XmpMMSchema.java b/fine-itext/src/com/fr/third/v2/lowagie/text/xml/xmp/XmpMMSchema.java
similarity index 99%
rename from fine-itext/src/com/third/v2/lowagie/text/xml/xmp/XmpMMSchema.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/xml/xmp/XmpMMSchema.java
index 46181e961..899b242f9 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/xml/xmp/XmpMMSchema.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/xml/xmp/XmpMMSchema.java
@@ -47,7 +47,7 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.xml.xmp;
+package com.fr.third.v2.lowagie.text.xml.xmp;
 
 /**
  * An implementation of an XmpSchema.
diff --git a/fine-itext/src/com/third/v2/lowagie/text/xml/xmp/XmpReader.java b/fine-itext/src/com/fr/third/v2/lowagie/text/xml/xmp/XmpReader.java
similarity index 97%
rename from fine-itext/src/com/third/v2/lowagie/text/xml/xmp/XmpReader.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/xml/xmp/XmpReader.java
index 024d5dc20..cf0cf770a 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/xml/xmp/XmpReader.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/xml/xmp/XmpReader.java
@@ -44,7 +44,7 @@
  * you aren't using an obsolete version:
  * http://www.lowagie.com/iText/
  */
-package com.third.v2.lowagie.text.xml.xmp;
+package com.fr.third.v2.lowagie.text.xml.xmp;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -54,14 +54,14 @@ import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
 
-import com.third.v2.lowagie.text.xml.XmlDomWriter;
+import com.fr.third.v2.lowagie.text.ExceptionConverter;
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 import org.xml.sax.SAXException;
 
-import com.third.v2.lowagie.text.ExceptionConverter;
+import com.fr.third.v2.lowagie.text.xml.XmlDomWriter;
 
 /**
  * Reads an XMP stream into an org.w3c.dom.Document objects.
@@ -76,7 +76,7 @@ public class XmpReader {
     /**
      * Constructs an XMP reader
      * @param	bytes	the XMP content
-     * @throws ExceptionConverter 
+     * @throws ExceptionConverter
      * @throws IOException 
      * @throws SAXException 
      */
diff --git a/fine-itext/src/com/third/v2/lowagie/text/xml/xmp/XmpSchema.java b/fine-itext/src/com/fr/third/v2/lowagie/text/xml/xmp/XmpSchema.java
similarity index 99%
rename from fine-itext/src/com/third/v2/lowagie/text/xml/xmp/XmpSchema.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/xml/xmp/XmpSchema.java
index 7684762c1..7e34a4a5e 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/xml/xmp/XmpSchema.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/xml/xmp/XmpSchema.java
@@ -47,7 +47,7 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.xml.xmp;
+package com.fr.third.v2.lowagie.text.xml.xmp;
 
 import java.util.Enumeration;
 import java.util.Properties;
diff --git a/fine-itext/src/com/third/v2/lowagie/text/xml/xmp/XmpWriter.java b/fine-itext/src/com/fr/third/v2/lowagie/text/xml/xmp/XmpWriter.java
similarity index 96%
rename from fine-itext/src/com/third/v2/lowagie/text/xml/xmp/XmpWriter.java
rename to fine-itext/src/com/fr/third/v2/lowagie/text/xml/xmp/XmpWriter.java
index 1e7e63926..d443518e9 100644
--- a/fine-itext/src/com/third/v2/lowagie/text/xml/xmp/XmpWriter.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/text/xml/xmp/XmpWriter.java
@@ -47,20 +47,20 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.text.xml.xmp;
+package com.fr.third.v2.lowagie.text.xml.xmp;
 
-import com.third.v2.lowagie.text.pdf.PdfWriter;
+import com.fr.third.v2.lowagie.text.pdf.PdfDate;
+import com.fr.third.v2.lowagie.text.pdf.PdfName;
+import com.fr.third.v2.lowagie.text.pdf.PdfWriter;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.io.OutputStreamWriter;
 import java.util.Iterator;
 import java.util.Map;
 
-import com.third.v2.lowagie.text.pdf.PdfDate;
-import com.third.v2.lowagie.text.pdf.PdfDictionary;
-import com.third.v2.lowagie.text.pdf.PdfName;
-import com.third.v2.lowagie.text.pdf.PdfObject;
-import com.third.v2.lowagie.text.pdf.PdfString;
+import com.fr.third.v2.lowagie.text.pdf.PdfDictionary;
+import com.fr.third.v2.lowagie.text.pdf.PdfObject;
+import com.fr.third.v2.lowagie.text.pdf.PdfString;
 
 /**
  * With this class you can create an Xmp Stream that can be used for adding
diff --git a/fine-itext/src/com/third/v2/lowagie/tools/BuildTutorial.java b/fine-itext/src/com/fr/third/v2/lowagie/tools/BuildTutorial.java
similarity index 99%
rename from fine-itext/src/com/third/v2/lowagie/tools/BuildTutorial.java
rename to fine-itext/src/com/fr/third/v2/lowagie/tools/BuildTutorial.java
index 0755e4d6c..afa4bb017 100644
--- a/fine-itext/src/com/third/v2/lowagie/tools/BuildTutorial.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/tools/BuildTutorial.java
@@ -46,7 +46,7 @@
  * you aren't using an obsolete version:
  * http://www.lowagie.com/iText/
  */
-package com.third.v2.lowagie.tools;
+package com.fr.third.v2.lowagie.tools;
 
 import java.io.File;
 import java.io.FileInputStream;
diff --git a/fine-itext/src/com/third/v2/lowagie/tools/ConcatPdf.java b/fine-itext/src/com/fr/third/v2/lowagie/tools/ConcatPdf.java
similarity index 94%
rename from fine-itext/src/com/third/v2/lowagie/tools/ConcatPdf.java
rename to fine-itext/src/com/fr/third/v2/lowagie/tools/ConcatPdf.java
index 668802b1d..70cca6a12 100644
--- a/fine-itext/src/com/third/v2/lowagie/tools/ConcatPdf.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/tools/ConcatPdf.java
@@ -47,17 +47,17 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.tools;
+package com.fr.third.v2.lowagie.tools;
 
 import java.io.FileOutputStream;
 import java.util.ArrayList;
 import java.util.List;
 
-import com.third.v2.lowagie.text.Document;
-import com.third.v2.lowagie.text.pdf.PdfCopy;
-import com.third.v2.lowagie.text.pdf.PdfImportedPage;
-import com.third.v2.lowagie.text.pdf.PdfReader;
-import com.third.v2.lowagie.text.pdf.SimpleBookmark;
+import com.fr.third.v2.lowagie.text.Document;
+import com.fr.third.v2.lowagie.text.pdf.PdfCopy;
+import com.fr.third.v2.lowagie.text.pdf.PdfImportedPage;
+import com.fr.third.v2.lowagie.text.pdf.PdfReader;
+import com.fr.third.v2.lowagie.text.pdf.SimpleBookmark;
 
 /**
  * Tool that can be used to concatenate existing PDF files.
@@ -81,7 +81,7 @@ public class ConcatPdf {
                 int f = 0;
                 String outFile = args[args.length-1];
                 Document document = null;
-                PdfCopy  writer = null;
+                PdfCopy writer = null;
                 while (f < args.length-1) {
                     // we create a reader for a certain document
                     PdfReader reader = new PdfReader(args[f]);
diff --git a/fine-itext/src/com/third/v2/lowagie/tools/EncryptPdf.java b/fine-itext/src/com/fr/third/v2/lowagie/tools/EncryptPdf.java
similarity index 96%
rename from fine-itext/src/com/third/v2/lowagie/tools/EncryptPdf.java
rename to fine-itext/src/com/fr/third/v2/lowagie/tools/EncryptPdf.java
index 4881b3950..6b4708e5b 100644
--- a/fine-itext/src/com/third/v2/lowagie/tools/EncryptPdf.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/tools/EncryptPdf.java
@@ -46,14 +46,14 @@
  * you aren't using an obsolete version:
  * http://www.lowagie.com/iText/
  */
-package com.third.v2.lowagie.tools;
+package com.fr.third.v2.lowagie.tools;
 
 import java.io.FileOutputStream;
 import java.util.HashMap;
 
-import com.third.v2.lowagie.text.pdf.PdfEncryptor;
-import com.third.v2.lowagie.text.pdf.PdfReader;
-import com.third.v2.lowagie.text.pdf.PdfWriter;
+import com.fr.third.v2.lowagie.text.pdf.PdfEncryptor;
+import com.fr.third.v2.lowagie.text.pdf.PdfReader;
+import com.fr.third.v2.lowagie.text.pdf.PdfWriter;
 
 /**
  * Encrypts a PDF document. It needs iText (http://www.lowagie.com/iText).
diff --git a/fine-itext/src/com/third/v2/lowagie/tools/Executable.java b/fine-itext/src/com/fr/third/v2/lowagie/tools/Executable.java
similarity index 99%
rename from fine-itext/src/com/third/v2/lowagie/tools/Executable.java
rename to fine-itext/src/com/fr/third/v2/lowagie/tools/Executable.java
index e0096dc11..e417bc4da 100644
--- a/fine-itext/src/com/third/v2/lowagie/tools/Executable.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/tools/Executable.java
@@ -46,7 +46,7 @@
  * you aren't using an obsolete version:
  * http://www.lowagie.com/iText/
  */
-package com.third.v2.lowagie.tools;
+package com.fr.third.v2.lowagie.tools;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/fine-itext/src/com/third/v2/lowagie/tools/HandoutPdf.java b/fine-itext/src/com/fr/third/v2/lowagie/tools/HandoutPdf.java
similarity index 92%
rename from fine-itext/src/com/third/v2/lowagie/tools/HandoutPdf.java
rename to fine-itext/src/com/fr/third/v2/lowagie/tools/HandoutPdf.java
index dae746929..b7b06d52c 100644
--- a/fine-itext/src/com/third/v2/lowagie/tools/HandoutPdf.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/tools/HandoutPdf.java
@@ -47,18 +47,18 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.tools;
+package com.fr.third.v2.lowagie.tools;
 
 import java.io.FileOutputStream;
 
-import com.third.v2.lowagie.text.Document;
-import com.third.v2.lowagie.text.DocumentException;
-import com.third.v2.lowagie.text.PageSize;
-import com.third.v2.lowagie.text.Rectangle;
-import com.third.v2.lowagie.text.pdf.PdfContentByte;
-import com.third.v2.lowagie.text.pdf.PdfImportedPage;
-import com.third.v2.lowagie.text.pdf.PdfReader;
-import com.third.v2.lowagie.text.pdf.PdfWriter;
+import com.fr.third.v2.lowagie.text.PageSize;
+import com.fr.third.v2.lowagie.text.pdf.PdfImportedPage;
+import com.fr.third.v2.lowagie.text.Document;
+import com.fr.third.v2.lowagie.text.DocumentException;
+import com.fr.third.v2.lowagie.text.Rectangle;
+import com.fr.third.v2.lowagie.text.pdf.PdfContentByte;
+import com.fr.third.v2.lowagie.text.pdf.PdfReader;
+import com.fr.third.v2.lowagie.text.pdf.PdfWriter;
 
 /**
  * Takes an existing PDF file and makes handouts.
diff --git a/fine-itext/src/com/third/v2/lowagie/tools/SplitPdf.java b/fine-itext/src/com/fr/third/v2/lowagie/tools/SplitPdf.java
similarity index 93%
rename from fine-itext/src/com/third/v2/lowagie/tools/SplitPdf.java
rename to fine-itext/src/com/fr/third/v2/lowagie/tools/SplitPdf.java
index 1ad08ef03..90ce55385 100644
--- a/fine-itext/src/com/third/v2/lowagie/tools/SplitPdf.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/tools/SplitPdf.java
@@ -47,16 +47,16 @@
  * http://www.lowagie.com/iText/
  */
 
-package com.third.v2.lowagie.tools;
+package com.fr.third.v2.lowagie.tools;
 
 import java.io.FileOutputStream;
 
-import com.third.v2.lowagie.text.Document;
-import com.third.v2.lowagie.text.DocumentException;
-import com.third.v2.lowagie.text.pdf.PdfContentByte;
-import com.third.v2.lowagie.text.pdf.PdfImportedPage;
-import com.third.v2.lowagie.text.pdf.PdfReader;
-import com.third.v2.lowagie.text.pdf.PdfWriter;
+import com.fr.third.v2.lowagie.text.pdf.PdfImportedPage;
+import com.fr.third.v2.lowagie.text.Document;
+import com.fr.third.v2.lowagie.text.DocumentException;
+import com.fr.third.v2.lowagie.text.pdf.PdfContentByte;
+import com.fr.third.v2.lowagie.text.pdf.PdfReader;
+import com.fr.third.v2.lowagie.text.pdf.PdfWriter;
 
 /**
  * This class demonstrates how to split a PDF file using iText.
diff --git a/fine-itext/src/com/third/v2/lowagie/tools/ToolboxAvailable.java b/fine-itext/src/com/fr/third/v2/lowagie/tools/ToolboxAvailable.java
similarity index 97%
rename from fine-itext/src/com/third/v2/lowagie/tools/ToolboxAvailable.java
rename to fine-itext/src/com/fr/third/v2/lowagie/tools/ToolboxAvailable.java
index 422e90245..d8528856a 100644
--- a/fine-itext/src/com/third/v2/lowagie/tools/ToolboxAvailable.java
+++ b/fine-itext/src/com/fr/third/v2/lowagie/tools/ToolboxAvailable.java
@@ -46,14 +46,14 @@
  * you aren't using an obsolete version:
  * http://www.lowagie.com/iText/
  */
-package com.third.v2.lowagie.tools;
+package com.fr.third.v2.lowagie.tools;
 
 import java.awt.GraphicsEnvironment;
 import java.lang.reflect.Method;
 
 import javax.swing.JOptionPane;
 
-import com.third.v2.lowagie.text.Document;
+import com.fr.third.v2.lowagie.text.Document;
 
 public class ToolboxAvailable {