From f182c870f84200d71283edcc076526930a432c75 Mon Sep 17 00:00:00 2001
From: deano2390 <dw86@kent.ac.uk>
Date: Thu, 26 Jun 2014 10:51:09 +0100
Subject: [PATCH] Another package rename to ensure maven is consistent

---
 .../src/main/AndroidManifest.xml              |   4 +-
 .../sample/MainActivity.java                  |   6 +-
 .../src/main/res/layout/activity_main.xml     |   4 +-
 flowtextview/build.gradle                     |  61 +++++++++++++++++-
 flowtextview/flowtextview.iml                 |   3 +-
 .../javadoc}/allclasses-frame.html            |   0
 .../javadoc}/allclasses-noframe.html          |   0
 .../com/deanwild/flowtext/FlowTextView.html   |   0
 .../flowtext/helpers/ClickHandler.html        |   0
 .../flowtext/helpers/CollisionHelper.html     |   0
 .../flowtext/helpers/PaintHelper.html         |   0
 .../deanwild/flowtext/helpers/SpanParser.html |   0
 .../flowtext/helpers/package-frame.html       |   0
 .../flowtext/helpers/package-summary.html     |   0
 .../flowtext/helpers/package-tree.html        |   0
 .../listeners/OnLinkClickListener.html        |   0
 .../flowtext/listeners/package-frame.html     |   0
 .../flowtext/listeners/package-summary.html   |   0
 .../flowtext/listeners/package-tree.html      |   0
 .../com/deanwild/flowtext/models/Area.html    |   0
 .../deanwild/flowtext/models/HtmlLink.html    |   0
 .../deanwild/flowtext/models/HtmlObject.html  |   0
 .../com/deanwild/flowtext/models/Line.html    |   0
 .../deanwild/flowtext/models/Obstacle.html    |   0
 .../flowtext/models/package-frame.html        |   0
 .../flowtext/models/package-summary.html      |   0
 .../flowtext/models/package-tree.html         |   0
 .../com/deanwild/flowtext/package-frame.html  |   0
 .../deanwild/flowtext/package-summary.html    |   0
 .../com/deanwild/flowtext/package-tree.html   |   0
 .../javadoc}/constant-values.html             |   0
 .../javadoc}/deprecated-list.html             |   0
 .../javadoc}/help-doc.html                    |   0
 .../javadoc}/index-files/index-1.html         |   0
 .../javadoc}/index-files/index-10.html        |   0
 .../javadoc}/index-files/index-11.html        |   0
 .../javadoc}/index-files/index-12.html        |   0
 .../javadoc}/index-files/index-13.html        |   0
 .../javadoc}/index-files/index-14.html        |   0
 .../javadoc}/index-files/index-15.html        |   0
 .../javadoc}/index-files/index-16.html        |   0
 .../javadoc}/index-files/index-17.html        |   0
 .../javadoc}/index-files/index-18.html        |   0
 .../javadoc}/index-files/index-2.html         |   0
 .../javadoc}/index-files/index-3.html         |   0
 .../javadoc}/index-files/index-4.html         |   0
 .../javadoc}/index-files/index-5.html         |   0
 .../javadoc}/index-files/index-6.html         |   0
 .../javadoc}/index-files/index-7.html         |   0
 .../javadoc}/index-files/index-8.html         |   0
 .../javadoc}/index-files/index-9.html         |   0
 {javadoc => flowtextview/javadoc}/index.html  |   0
 .../javadoc}/overview-frame.html              |   0
 .../javadoc}/overview-summary.html            |   0
 .../javadoc}/overview-tree.html               |   0
 .../javadoc}/package-list                     |   0
 .../javadoc}/resources/background.gif         | Bin
 .../javadoc}/resources/tab.gif                | Bin
 .../javadoc}/resources/titlebar.gif           | Bin
 .../javadoc}/resources/titlebar_end.gif       | Bin
 .../javadoc}/stylesheet.css                   |   0
 flowtextview/src/main/AndroidManifest.xml     |   2 +-
 .../FlowTextView.java                         |  20 +++---
 .../helpers/ClickHandler.java                 |   6 +-
 .../helpers/CollisionHelper.java              |   8 +--
 .../helpers/PaintHelper.java                  |   2 +-
 .../helpers/SpanParser.java                   |   8 +--
 .../listeners/OnLinkClickListener.java        |   2 +-
 .../models/Area.java                          |   2 +-
 .../models/HtmlLink.java                      |   2 +-
 .../models/HtmlObject.java                    |   2 +-
 .../models/Line.java                          |   2 +-
 .../models/Obstacle.java                      |   2 +-
 73 files changed, 97 insertions(+), 39 deletions(-)
 rename flowtextview-sample/src/main/java/uk/co/deanwild/{flowtext => flowtextview}/sample/MainActivity.java (95%)
 rename {javadoc => flowtextview/javadoc}/allclasses-frame.html (100%)
 rename {javadoc => flowtextview/javadoc}/allclasses-noframe.html (100%)
 rename {javadoc => flowtextview/javadoc}/com/deanwild/flowtext/FlowTextView.html (100%)
 rename {javadoc => flowtextview/javadoc}/com/deanwild/flowtext/helpers/ClickHandler.html (100%)
 rename {javadoc => flowtextview/javadoc}/com/deanwild/flowtext/helpers/CollisionHelper.html (100%)
 rename {javadoc => flowtextview/javadoc}/com/deanwild/flowtext/helpers/PaintHelper.html (100%)
 rename {javadoc => flowtextview/javadoc}/com/deanwild/flowtext/helpers/SpanParser.html (100%)
 rename {javadoc => flowtextview/javadoc}/com/deanwild/flowtext/helpers/package-frame.html (100%)
 rename {javadoc => flowtextview/javadoc}/com/deanwild/flowtext/helpers/package-summary.html (100%)
 rename {javadoc => flowtextview/javadoc}/com/deanwild/flowtext/helpers/package-tree.html (100%)
 rename {javadoc => flowtextview/javadoc}/com/deanwild/flowtext/listeners/OnLinkClickListener.html (100%)
 rename {javadoc => flowtextview/javadoc}/com/deanwild/flowtext/listeners/package-frame.html (100%)
 rename {javadoc => flowtextview/javadoc}/com/deanwild/flowtext/listeners/package-summary.html (100%)
 rename {javadoc => flowtextview/javadoc}/com/deanwild/flowtext/listeners/package-tree.html (100%)
 rename {javadoc => flowtextview/javadoc}/com/deanwild/flowtext/models/Area.html (100%)
 rename {javadoc => flowtextview/javadoc}/com/deanwild/flowtext/models/HtmlLink.html (100%)
 rename {javadoc => flowtextview/javadoc}/com/deanwild/flowtext/models/HtmlObject.html (100%)
 rename {javadoc => flowtextview/javadoc}/com/deanwild/flowtext/models/Line.html (100%)
 rename {javadoc => flowtextview/javadoc}/com/deanwild/flowtext/models/Obstacle.html (100%)
 rename {javadoc => flowtextview/javadoc}/com/deanwild/flowtext/models/package-frame.html (100%)
 rename {javadoc => flowtextview/javadoc}/com/deanwild/flowtext/models/package-summary.html (100%)
 rename {javadoc => flowtextview/javadoc}/com/deanwild/flowtext/models/package-tree.html (100%)
 rename {javadoc => flowtextview/javadoc}/com/deanwild/flowtext/package-frame.html (100%)
 rename {javadoc => flowtextview/javadoc}/com/deanwild/flowtext/package-summary.html (100%)
 rename {javadoc => flowtextview/javadoc}/com/deanwild/flowtext/package-tree.html (100%)
 rename {javadoc => flowtextview/javadoc}/constant-values.html (100%)
 rename {javadoc => flowtextview/javadoc}/deprecated-list.html (100%)
 rename {javadoc => flowtextview/javadoc}/help-doc.html (100%)
 rename {javadoc => flowtextview/javadoc}/index-files/index-1.html (100%)
 rename {javadoc => flowtextview/javadoc}/index-files/index-10.html (100%)
 rename {javadoc => flowtextview/javadoc}/index-files/index-11.html (100%)
 rename {javadoc => flowtextview/javadoc}/index-files/index-12.html (100%)
 rename {javadoc => flowtextview/javadoc}/index-files/index-13.html (100%)
 rename {javadoc => flowtextview/javadoc}/index-files/index-14.html (100%)
 rename {javadoc => flowtextview/javadoc}/index-files/index-15.html (100%)
 rename {javadoc => flowtextview/javadoc}/index-files/index-16.html (100%)
 rename {javadoc => flowtextview/javadoc}/index-files/index-17.html (100%)
 rename {javadoc => flowtextview/javadoc}/index-files/index-18.html (100%)
 rename {javadoc => flowtextview/javadoc}/index-files/index-2.html (100%)
 rename {javadoc => flowtextview/javadoc}/index-files/index-3.html (100%)
 rename {javadoc => flowtextview/javadoc}/index-files/index-4.html (100%)
 rename {javadoc => flowtextview/javadoc}/index-files/index-5.html (100%)
 rename {javadoc => flowtextview/javadoc}/index-files/index-6.html (100%)
 rename {javadoc => flowtextview/javadoc}/index-files/index-7.html (100%)
 rename {javadoc => flowtextview/javadoc}/index-files/index-8.html (100%)
 rename {javadoc => flowtextview/javadoc}/index-files/index-9.html (100%)
 rename {javadoc => flowtextview/javadoc}/index.html (100%)
 rename {javadoc => flowtextview/javadoc}/overview-frame.html (100%)
 rename {javadoc => flowtextview/javadoc}/overview-summary.html (100%)
 rename {javadoc => flowtextview/javadoc}/overview-tree.html (100%)
 rename {javadoc => flowtextview/javadoc}/package-list (100%)
 rename {javadoc => flowtextview/javadoc}/resources/background.gif (100%)
 rename {javadoc => flowtextview/javadoc}/resources/tab.gif (100%)
 rename {javadoc => flowtextview/javadoc}/resources/titlebar.gif (100%)
 rename {javadoc => flowtextview/javadoc}/resources/titlebar_end.gif (100%)
 rename {javadoc => flowtextview/javadoc}/stylesheet.css (100%)
 rename flowtextview/src/main/java/uk/co/deanwild/{flowtext => flowtextview}/FlowTextView.java (96%)
 rename flowtextview/src/main/java/uk/co/deanwild/{flowtext => flowtextview}/helpers/ClickHandler.java (93%)
 rename flowtextview/src/main/java/uk/co/deanwild/{flowtext => flowtextview}/helpers/CollisionHelper.java (93%)
 rename flowtextview/src/main/java/uk/co/deanwild/{flowtext => flowtextview}/helpers/PaintHelper.java (93%)
 rename flowtextview/src/main/java/uk/co/deanwild/{flowtext => flowtextview}/helpers/SpanParser.java (96%)
 rename flowtextview/src/main/java/uk/co/deanwild/{flowtext => flowtextview}/listeners/OnLinkClickListener.java (72%)
 rename flowtextview/src/main/java/uk/co/deanwild/{flowtext => flowtextview}/models/Area.java (74%)
 rename flowtextview/src/main/java/uk/co/deanwild/{flowtext => flowtextview}/models/HtmlLink.java (90%)
 rename flowtextview/src/main/java/uk/co/deanwild/{flowtext => flowtextview}/models/HtmlObject.java (92%)
 rename flowtextview/src/main/java/uk/co/deanwild/{flowtext => flowtextview}/models/Line.java (73%)
 rename flowtextview/src/main/java/uk/co/deanwild/{flowtext => flowtextview}/models/Obstacle.java (79%)

diff --git a/flowtextview-sample/src/main/AndroidManifest.xml b/flowtextview-sample/src/main/AndroidManifest.xml
index d79724f..9d60286 100644
--- a/flowtextview-sample/src/main/AndroidManifest.xml
+++ b/flowtextview-sample/src/main/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="uk.co.deanwild.flowtext.sample" >
+    package="uk.co.deanwild.flowtextview.sample" >
 
     <application
         android:allowBackup="true"
@@ -8,7 +8,7 @@
         android:label="@string/app_name"
         android:theme="@style/AppTheme" >
         <activity
-            android:name="uk.co.deanwild.flowtext.sample.MainActivity"
+            android:name="uk.co.deanwild.flowtextview.sample.MainActivity"
             android:label="FlowTextView Demo" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/flowtextview-sample/src/main/java/uk/co/deanwild/flowtext/sample/MainActivity.java b/flowtextview-sample/src/main/java/uk/co/deanwild/flowtextview/sample/MainActivity.java
similarity index 95%
rename from flowtextview-sample/src/main/java/uk/co/deanwild/flowtext/sample/MainActivity.java
rename to flowtextview-sample/src/main/java/uk/co/deanwild/flowtextview/sample/MainActivity.java
index cf689ea..7621928 100644
--- a/flowtextview-sample/src/main/java/uk/co/deanwild/flowtext/sample/MainActivity.java
+++ b/flowtextview-sample/src/main/java/uk/co/deanwild/flowtextview/sample/MainActivity.java
@@ -1,4 +1,4 @@
-package uk.co.deanwild.flowtext.sample;
+package uk.co.deanwild.flowtextview.sample;
 
 import android.os.Bundle;
 import android.support.v7.app.ActionBarActivity;
@@ -7,7 +7,7 @@
 import android.view.View;
 import android.widget.Button;
 
-import uk.co.deanwild.flowtext.FlowTextView;
+import uk.co.deanwild.flowtextview.FlowTextView;
 
 
 public class MainActivity extends ActionBarActivity implements View.OnClickListener {
@@ -31,8 +31,6 @@ protected void onCreate(Bundle savedInstanceState) {
         btnDecreasefontSize.setOnClickListener(this);
         Button btnReset = (Button) findViewById(R.id.btn_reset);
         btnReset.setOnClickListener(this);
-
-
     }
 
     @Override
diff --git a/flowtextview-sample/src/main/res/layout/activity_main.xml b/flowtextview-sample/src/main/res/layout/activity_main.xml
index 09cbdd1..7c73b29 100644
--- a/flowtextview-sample/src/main/res/layout/activity_main.xml
+++ b/flowtextview-sample/src/main/res/layout/activity_main.xml
@@ -12,7 +12,7 @@
         android:layout_width="match_parent"
         android:layout_height="0dip"
         android:layout_weight="1" >
-        <uk.co.deanwild.flowtext.FlowTextView
+        <uk.co.deanwild.flowtextview.FlowTextView
             android:id="@+id/ftv"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content" >
@@ -32,7 +32,7 @@
                 android:layout_marginTop="400dip"
                 android:padding="10dip"
                 android:src="@drawable/android2"/>
-        </uk.co.deanwild.flowtext.FlowTextView>
+        </uk.co.deanwild.flowtextview.FlowTextView>
     </ScrollView>
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/flowtextview/build.gradle b/flowtextview/build.gradle
index f489879..902a087 100644
--- a/flowtextview/build.gradle
+++ b/flowtextview/build.gradle
@@ -1,11 +1,68 @@
 apply plugin: 'android-library'
+apply plugin: 'maven'
+apply plugin: 'signing'
+
+version = "2.0.1"
+group = "uk.co.deanwild"
+
+configurations {
+    archives {
+        extendsFrom configurations.default
+    }
+}
+
+signing {
+    required { has("release") && gradle.taskGraph.hasTask("uploadArchives") }
+    sign configurations.archives
+}
+
+uploadArchives {
+    configuration = configurations.archives
+    repositories.mavenDeployer {
+        beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
+
+        repository(url: "https://oss.sonatype.org/service/local/staging/deploy/maven2") {
+            authentication(userName: "dw86@kent.ac.uk",
+                    password: "access28")
+        }
+
+        pom.project {
+            name 'Android FlowTextView Library'
+            packaging 'aar'
+            description 'Wrapping TextView for Android'
+            url 'https://github.com/deano2390/FlowTextView'
+
+            scm {
+                url 'scm:git@github.com:deano2390/FlowTextView.git'
+                connection 'scm:git@github.com:deano2390/FlowTextView.git'
+                developerConnection 'scm:git@github.com:deano2390/FlowTextView.git'
+            }
+
+            licenses {
+                license {
+                    name 'The Apache Software License, Version 2.0'
+                    url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
+                    distribution 'repo'
+                }
+            }
+
+            developers {
+                developer {
+                    id 'dw'
+                    name 'Dean Wild'
+                    email 'dw86@kent.ac.uk'
+                }
+            }
+        }
+    }
+}
 
 android {
     compileSdkVersion 16
     buildToolsVersion "19.1.0"
 
     defaultConfig {
-        applicationId "com.pagesuite.coretext"
+        applicationId "uk.co.deanwild.flowtext"
         minSdkVersion 8
         targetSdkVersion 15
     }
@@ -17,3 +74,5 @@ android {
         }
     }
 }
+
+
diff --git a/flowtextview/flowtextview.iml b/flowtextview/flowtextview.iml
index bfdd48c..4b9d290 100644
--- a/flowtextview/flowtextview.iml
+++ b/flowtextview/flowtextview.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="FlowTextView" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="uk.co.deanwild" external.system.module.version="2.0.1" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="android-gradle" name="Android-Gradle">
       <configuration>
@@ -59,6 +59,7 @@
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/poms" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="jdk" jdkName="Android API 16 Platform" jdkType="Android SDK" />
diff --git a/javadoc/allclasses-frame.html b/flowtextview/javadoc/allclasses-frame.html
similarity index 100%
rename from javadoc/allclasses-frame.html
rename to flowtextview/javadoc/allclasses-frame.html
diff --git a/javadoc/allclasses-noframe.html b/flowtextview/javadoc/allclasses-noframe.html
similarity index 100%
rename from javadoc/allclasses-noframe.html
rename to flowtextview/javadoc/allclasses-noframe.html
diff --git a/javadoc/com/deanwild/flowtext/FlowTextView.html b/flowtextview/javadoc/com/deanwild/flowtext/FlowTextView.html
similarity index 100%
rename from javadoc/com/deanwild/flowtext/FlowTextView.html
rename to flowtextview/javadoc/com/deanwild/flowtext/FlowTextView.html
diff --git a/javadoc/com/deanwild/flowtext/helpers/ClickHandler.html b/flowtextview/javadoc/com/deanwild/flowtext/helpers/ClickHandler.html
similarity index 100%
rename from javadoc/com/deanwild/flowtext/helpers/ClickHandler.html
rename to flowtextview/javadoc/com/deanwild/flowtext/helpers/ClickHandler.html
diff --git a/javadoc/com/deanwild/flowtext/helpers/CollisionHelper.html b/flowtextview/javadoc/com/deanwild/flowtext/helpers/CollisionHelper.html
similarity index 100%
rename from javadoc/com/deanwild/flowtext/helpers/CollisionHelper.html
rename to flowtextview/javadoc/com/deanwild/flowtext/helpers/CollisionHelper.html
diff --git a/javadoc/com/deanwild/flowtext/helpers/PaintHelper.html b/flowtextview/javadoc/com/deanwild/flowtext/helpers/PaintHelper.html
similarity index 100%
rename from javadoc/com/deanwild/flowtext/helpers/PaintHelper.html
rename to flowtextview/javadoc/com/deanwild/flowtext/helpers/PaintHelper.html
diff --git a/javadoc/com/deanwild/flowtext/helpers/SpanParser.html b/flowtextview/javadoc/com/deanwild/flowtext/helpers/SpanParser.html
similarity index 100%
rename from javadoc/com/deanwild/flowtext/helpers/SpanParser.html
rename to flowtextview/javadoc/com/deanwild/flowtext/helpers/SpanParser.html
diff --git a/javadoc/com/deanwild/flowtext/helpers/package-frame.html b/flowtextview/javadoc/com/deanwild/flowtext/helpers/package-frame.html
similarity index 100%
rename from javadoc/com/deanwild/flowtext/helpers/package-frame.html
rename to flowtextview/javadoc/com/deanwild/flowtext/helpers/package-frame.html
diff --git a/javadoc/com/deanwild/flowtext/helpers/package-summary.html b/flowtextview/javadoc/com/deanwild/flowtext/helpers/package-summary.html
similarity index 100%
rename from javadoc/com/deanwild/flowtext/helpers/package-summary.html
rename to flowtextview/javadoc/com/deanwild/flowtext/helpers/package-summary.html
diff --git a/javadoc/com/deanwild/flowtext/helpers/package-tree.html b/flowtextview/javadoc/com/deanwild/flowtext/helpers/package-tree.html
similarity index 100%
rename from javadoc/com/deanwild/flowtext/helpers/package-tree.html
rename to flowtextview/javadoc/com/deanwild/flowtext/helpers/package-tree.html
diff --git a/javadoc/com/deanwild/flowtext/listeners/OnLinkClickListener.html b/flowtextview/javadoc/com/deanwild/flowtext/listeners/OnLinkClickListener.html
similarity index 100%
rename from javadoc/com/deanwild/flowtext/listeners/OnLinkClickListener.html
rename to flowtextview/javadoc/com/deanwild/flowtext/listeners/OnLinkClickListener.html
diff --git a/javadoc/com/deanwild/flowtext/listeners/package-frame.html b/flowtextview/javadoc/com/deanwild/flowtext/listeners/package-frame.html
similarity index 100%
rename from javadoc/com/deanwild/flowtext/listeners/package-frame.html
rename to flowtextview/javadoc/com/deanwild/flowtext/listeners/package-frame.html
diff --git a/javadoc/com/deanwild/flowtext/listeners/package-summary.html b/flowtextview/javadoc/com/deanwild/flowtext/listeners/package-summary.html
similarity index 100%
rename from javadoc/com/deanwild/flowtext/listeners/package-summary.html
rename to flowtextview/javadoc/com/deanwild/flowtext/listeners/package-summary.html
diff --git a/javadoc/com/deanwild/flowtext/listeners/package-tree.html b/flowtextview/javadoc/com/deanwild/flowtext/listeners/package-tree.html
similarity index 100%
rename from javadoc/com/deanwild/flowtext/listeners/package-tree.html
rename to flowtextview/javadoc/com/deanwild/flowtext/listeners/package-tree.html
diff --git a/javadoc/com/deanwild/flowtext/models/Area.html b/flowtextview/javadoc/com/deanwild/flowtext/models/Area.html
similarity index 100%
rename from javadoc/com/deanwild/flowtext/models/Area.html
rename to flowtextview/javadoc/com/deanwild/flowtext/models/Area.html
diff --git a/javadoc/com/deanwild/flowtext/models/HtmlLink.html b/flowtextview/javadoc/com/deanwild/flowtext/models/HtmlLink.html
similarity index 100%
rename from javadoc/com/deanwild/flowtext/models/HtmlLink.html
rename to flowtextview/javadoc/com/deanwild/flowtext/models/HtmlLink.html
diff --git a/javadoc/com/deanwild/flowtext/models/HtmlObject.html b/flowtextview/javadoc/com/deanwild/flowtext/models/HtmlObject.html
similarity index 100%
rename from javadoc/com/deanwild/flowtext/models/HtmlObject.html
rename to flowtextview/javadoc/com/deanwild/flowtext/models/HtmlObject.html
diff --git a/javadoc/com/deanwild/flowtext/models/Line.html b/flowtextview/javadoc/com/deanwild/flowtext/models/Line.html
similarity index 100%
rename from javadoc/com/deanwild/flowtext/models/Line.html
rename to flowtextview/javadoc/com/deanwild/flowtext/models/Line.html
diff --git a/javadoc/com/deanwild/flowtext/models/Obstacle.html b/flowtextview/javadoc/com/deanwild/flowtext/models/Obstacle.html
similarity index 100%
rename from javadoc/com/deanwild/flowtext/models/Obstacle.html
rename to flowtextview/javadoc/com/deanwild/flowtext/models/Obstacle.html
diff --git a/javadoc/com/deanwild/flowtext/models/package-frame.html b/flowtextview/javadoc/com/deanwild/flowtext/models/package-frame.html
similarity index 100%
rename from javadoc/com/deanwild/flowtext/models/package-frame.html
rename to flowtextview/javadoc/com/deanwild/flowtext/models/package-frame.html
diff --git a/javadoc/com/deanwild/flowtext/models/package-summary.html b/flowtextview/javadoc/com/deanwild/flowtext/models/package-summary.html
similarity index 100%
rename from javadoc/com/deanwild/flowtext/models/package-summary.html
rename to flowtextview/javadoc/com/deanwild/flowtext/models/package-summary.html
diff --git a/javadoc/com/deanwild/flowtext/models/package-tree.html b/flowtextview/javadoc/com/deanwild/flowtext/models/package-tree.html
similarity index 100%
rename from javadoc/com/deanwild/flowtext/models/package-tree.html
rename to flowtextview/javadoc/com/deanwild/flowtext/models/package-tree.html
diff --git a/javadoc/com/deanwild/flowtext/package-frame.html b/flowtextview/javadoc/com/deanwild/flowtext/package-frame.html
similarity index 100%
rename from javadoc/com/deanwild/flowtext/package-frame.html
rename to flowtextview/javadoc/com/deanwild/flowtext/package-frame.html
diff --git a/javadoc/com/deanwild/flowtext/package-summary.html b/flowtextview/javadoc/com/deanwild/flowtext/package-summary.html
similarity index 100%
rename from javadoc/com/deanwild/flowtext/package-summary.html
rename to flowtextview/javadoc/com/deanwild/flowtext/package-summary.html
diff --git a/javadoc/com/deanwild/flowtext/package-tree.html b/flowtextview/javadoc/com/deanwild/flowtext/package-tree.html
similarity index 100%
rename from javadoc/com/deanwild/flowtext/package-tree.html
rename to flowtextview/javadoc/com/deanwild/flowtext/package-tree.html
diff --git a/javadoc/constant-values.html b/flowtextview/javadoc/constant-values.html
similarity index 100%
rename from javadoc/constant-values.html
rename to flowtextview/javadoc/constant-values.html
diff --git a/javadoc/deprecated-list.html b/flowtextview/javadoc/deprecated-list.html
similarity index 100%
rename from javadoc/deprecated-list.html
rename to flowtextview/javadoc/deprecated-list.html
diff --git a/javadoc/help-doc.html b/flowtextview/javadoc/help-doc.html
similarity index 100%
rename from javadoc/help-doc.html
rename to flowtextview/javadoc/help-doc.html
diff --git a/javadoc/index-files/index-1.html b/flowtextview/javadoc/index-files/index-1.html
similarity index 100%
rename from javadoc/index-files/index-1.html
rename to flowtextview/javadoc/index-files/index-1.html
diff --git a/javadoc/index-files/index-10.html b/flowtextview/javadoc/index-files/index-10.html
similarity index 100%
rename from javadoc/index-files/index-10.html
rename to flowtextview/javadoc/index-files/index-10.html
diff --git a/javadoc/index-files/index-11.html b/flowtextview/javadoc/index-files/index-11.html
similarity index 100%
rename from javadoc/index-files/index-11.html
rename to flowtextview/javadoc/index-files/index-11.html
diff --git a/javadoc/index-files/index-12.html b/flowtextview/javadoc/index-files/index-12.html
similarity index 100%
rename from javadoc/index-files/index-12.html
rename to flowtextview/javadoc/index-files/index-12.html
diff --git a/javadoc/index-files/index-13.html b/flowtextview/javadoc/index-files/index-13.html
similarity index 100%
rename from javadoc/index-files/index-13.html
rename to flowtextview/javadoc/index-files/index-13.html
diff --git a/javadoc/index-files/index-14.html b/flowtextview/javadoc/index-files/index-14.html
similarity index 100%
rename from javadoc/index-files/index-14.html
rename to flowtextview/javadoc/index-files/index-14.html
diff --git a/javadoc/index-files/index-15.html b/flowtextview/javadoc/index-files/index-15.html
similarity index 100%
rename from javadoc/index-files/index-15.html
rename to flowtextview/javadoc/index-files/index-15.html
diff --git a/javadoc/index-files/index-16.html b/flowtextview/javadoc/index-files/index-16.html
similarity index 100%
rename from javadoc/index-files/index-16.html
rename to flowtextview/javadoc/index-files/index-16.html
diff --git a/javadoc/index-files/index-17.html b/flowtextview/javadoc/index-files/index-17.html
similarity index 100%
rename from javadoc/index-files/index-17.html
rename to flowtextview/javadoc/index-files/index-17.html
diff --git a/javadoc/index-files/index-18.html b/flowtextview/javadoc/index-files/index-18.html
similarity index 100%
rename from javadoc/index-files/index-18.html
rename to flowtextview/javadoc/index-files/index-18.html
diff --git a/javadoc/index-files/index-2.html b/flowtextview/javadoc/index-files/index-2.html
similarity index 100%
rename from javadoc/index-files/index-2.html
rename to flowtextview/javadoc/index-files/index-2.html
diff --git a/javadoc/index-files/index-3.html b/flowtextview/javadoc/index-files/index-3.html
similarity index 100%
rename from javadoc/index-files/index-3.html
rename to flowtextview/javadoc/index-files/index-3.html
diff --git a/javadoc/index-files/index-4.html b/flowtextview/javadoc/index-files/index-4.html
similarity index 100%
rename from javadoc/index-files/index-4.html
rename to flowtextview/javadoc/index-files/index-4.html
diff --git a/javadoc/index-files/index-5.html b/flowtextview/javadoc/index-files/index-5.html
similarity index 100%
rename from javadoc/index-files/index-5.html
rename to flowtextview/javadoc/index-files/index-5.html
diff --git a/javadoc/index-files/index-6.html b/flowtextview/javadoc/index-files/index-6.html
similarity index 100%
rename from javadoc/index-files/index-6.html
rename to flowtextview/javadoc/index-files/index-6.html
diff --git a/javadoc/index-files/index-7.html b/flowtextview/javadoc/index-files/index-7.html
similarity index 100%
rename from javadoc/index-files/index-7.html
rename to flowtextview/javadoc/index-files/index-7.html
diff --git a/javadoc/index-files/index-8.html b/flowtextview/javadoc/index-files/index-8.html
similarity index 100%
rename from javadoc/index-files/index-8.html
rename to flowtextview/javadoc/index-files/index-8.html
diff --git a/javadoc/index-files/index-9.html b/flowtextview/javadoc/index-files/index-9.html
similarity index 100%
rename from javadoc/index-files/index-9.html
rename to flowtextview/javadoc/index-files/index-9.html
diff --git a/javadoc/index.html b/flowtextview/javadoc/index.html
similarity index 100%
rename from javadoc/index.html
rename to flowtextview/javadoc/index.html
diff --git a/javadoc/overview-frame.html b/flowtextview/javadoc/overview-frame.html
similarity index 100%
rename from javadoc/overview-frame.html
rename to flowtextview/javadoc/overview-frame.html
diff --git a/javadoc/overview-summary.html b/flowtextview/javadoc/overview-summary.html
similarity index 100%
rename from javadoc/overview-summary.html
rename to flowtextview/javadoc/overview-summary.html
diff --git a/javadoc/overview-tree.html b/flowtextview/javadoc/overview-tree.html
similarity index 100%
rename from javadoc/overview-tree.html
rename to flowtextview/javadoc/overview-tree.html
diff --git a/javadoc/package-list b/flowtextview/javadoc/package-list
similarity index 100%
rename from javadoc/package-list
rename to flowtextview/javadoc/package-list
diff --git a/javadoc/resources/background.gif b/flowtextview/javadoc/resources/background.gif
similarity index 100%
rename from javadoc/resources/background.gif
rename to flowtextview/javadoc/resources/background.gif
diff --git a/javadoc/resources/tab.gif b/flowtextview/javadoc/resources/tab.gif
similarity index 100%
rename from javadoc/resources/tab.gif
rename to flowtextview/javadoc/resources/tab.gif
diff --git a/javadoc/resources/titlebar.gif b/flowtextview/javadoc/resources/titlebar.gif
similarity index 100%
rename from javadoc/resources/titlebar.gif
rename to flowtextview/javadoc/resources/titlebar.gif
diff --git a/javadoc/resources/titlebar_end.gif b/flowtextview/javadoc/resources/titlebar_end.gif
similarity index 100%
rename from javadoc/resources/titlebar_end.gif
rename to flowtextview/javadoc/resources/titlebar_end.gif
diff --git a/javadoc/stylesheet.css b/flowtextview/javadoc/stylesheet.css
similarity index 100%
rename from javadoc/stylesheet.css
rename to flowtextview/javadoc/stylesheet.css
diff --git a/flowtextview/src/main/AndroidManifest.xml b/flowtextview/src/main/AndroidManifest.xml
index 25fe45d..4af8b40 100644
--- a/flowtextview/src/main/AndroidManifest.xml
+++ b/flowtextview/src/main/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="uk.co.deanwild.flowtext.flowtextview"
+    package="uk.co.deanwild.flowtextview.flowtextview"
     android:versionCode="1"
     android:versionName="1.0" >
 
diff --git a/flowtextview/src/main/java/uk/co/deanwild/flowtext/FlowTextView.java b/flowtextview/src/main/java/uk/co/deanwild/flowtextview/FlowTextView.java
similarity index 96%
rename from flowtextview/src/main/java/uk/co/deanwild/flowtext/FlowTextView.java
rename to flowtextview/src/main/java/uk/co/deanwild/flowtextview/FlowTextView.java
index 96fb985..c2cc82e 100644
--- a/flowtextview/src/main/java/uk/co/deanwild/flowtext/FlowTextView.java
+++ b/flowtextview/src/main/java/uk/co/deanwild/flowtextview/FlowTextView.java
@@ -1,4 +1,4 @@
-package uk.co.deanwild.flowtext;
+package uk.co.deanwild.flowtextview;
 
 import android.content.Context;
 import android.content.res.Configuration;
@@ -15,15 +15,15 @@
 
 import java.util.ArrayList;
 
-import uk.co.deanwild.flowtext.helpers.ClickHandler;
-import uk.co.deanwild.flowtext.helpers.CollisionHelper;
-import uk.co.deanwild.flowtext.helpers.PaintHelper;
-import uk.co.deanwild.flowtext.helpers.SpanParser;
-import uk.co.deanwild.flowtext.listeners.OnLinkClickListener;
-import uk.co.deanwild.flowtext.models.HtmlLink;
-import uk.co.deanwild.flowtext.models.HtmlObject;
-import uk.co.deanwild.flowtext.models.Line;
-import uk.co.deanwild.flowtext.models.Obstacle;
+import uk.co.deanwild.flowtextview.helpers.ClickHandler;
+import uk.co.deanwild.flowtextview.helpers.CollisionHelper;
+import uk.co.deanwild.flowtextview.helpers.PaintHelper;
+import uk.co.deanwild.flowtextview.helpers.SpanParser;
+import uk.co.deanwild.flowtextview.listeners.OnLinkClickListener;
+import uk.co.deanwild.flowtextview.models.HtmlLink;
+import uk.co.deanwild.flowtextview.models.HtmlObject;
+import uk.co.deanwild.flowtextview.models.Line;
+import uk.co.deanwild.flowtextview.models.Obstacle;
 
 public class FlowTextView extends RelativeLayout {
 
diff --git a/flowtextview/src/main/java/uk/co/deanwild/flowtext/helpers/ClickHandler.java b/flowtextview/src/main/java/uk/co/deanwild/flowtextview/helpers/ClickHandler.java
similarity index 93%
rename from flowtextview/src/main/java/uk/co/deanwild/flowtext/helpers/ClickHandler.java
rename to flowtextview/src/main/java/uk/co/deanwild/flowtextview/helpers/ClickHandler.java
index 8c03bc1..bc4c8f2 100644
--- a/flowtextview/src/main/java/uk/co/deanwild/flowtext/helpers/ClickHandler.java
+++ b/flowtextview/src/main/java/uk/co/deanwild/flowtextview/helpers/ClickHandler.java
@@ -1,12 +1,12 @@
-package uk.co.deanwild.flowtext.helpers;
+package uk.co.deanwild.flowtextview.helpers;
 
 import android.view.MotionEvent;
 import android.view.View;
 
 import java.util.ArrayList;
 
-import uk.co.deanwild.flowtext.listeners.OnLinkClickListener;
-import uk.co.deanwild.flowtext.models.HtmlLink;
+import uk.co.deanwild.flowtextview.listeners.OnLinkClickListener;
+import uk.co.deanwild.flowtextview.models.HtmlLink;
 
 /**
  * Created by Dean on 24/06/2014.
diff --git a/flowtextview/src/main/java/uk/co/deanwild/flowtext/helpers/CollisionHelper.java b/flowtextview/src/main/java/uk/co/deanwild/flowtextview/helpers/CollisionHelper.java
similarity index 93%
rename from flowtextview/src/main/java/uk/co/deanwild/flowtext/helpers/CollisionHelper.java
rename to flowtextview/src/main/java/uk/co/deanwild/flowtextview/helpers/CollisionHelper.java
index fd19cf6..cd81685 100644
--- a/flowtextview/src/main/java/uk/co/deanwild/flowtext/helpers/CollisionHelper.java
+++ b/flowtextview/src/main/java/uk/co/deanwild/flowtextview/helpers/CollisionHelper.java
@@ -1,11 +1,11 @@
-package uk.co.deanwild.flowtext.helpers;
+package uk.co.deanwild.flowtextview.helpers;
 
 
 import java.util.ArrayList;
 
-import uk.co.deanwild.flowtext.models.Area;
-import uk.co.deanwild.flowtext.models.Line;
-import uk.co.deanwild.flowtext.models.Obstacle;
+import uk.co.deanwild.flowtextview.models.Area;
+import uk.co.deanwild.flowtextview.models.Line;
+import uk.co.deanwild.flowtextview.models.Obstacle;
 
 /**
  * Created by Dean on 24/06/2014.
diff --git a/flowtextview/src/main/java/uk/co/deanwild/flowtext/helpers/PaintHelper.java b/flowtextview/src/main/java/uk/co/deanwild/flowtextview/helpers/PaintHelper.java
similarity index 93%
rename from flowtextview/src/main/java/uk/co/deanwild/flowtext/helpers/PaintHelper.java
rename to flowtextview/src/main/java/uk/co/deanwild/flowtextview/helpers/PaintHelper.java
index 1237395..dc47b58 100644
--- a/flowtextview/src/main/java/uk/co/deanwild/flowtext/helpers/PaintHelper.java
+++ b/flowtextview/src/main/java/uk/co/deanwild/flowtextview/helpers/PaintHelper.java
@@ -1,4 +1,4 @@
-package uk.co.deanwild.flowtext.helpers;
+package uk.co.deanwild.flowtextview.helpers;
 
 import android.graphics.Paint;
 import android.text.TextPaint;
diff --git a/flowtextview/src/main/java/uk/co/deanwild/flowtext/helpers/SpanParser.java b/flowtextview/src/main/java/uk/co/deanwild/flowtextview/helpers/SpanParser.java
similarity index 96%
rename from flowtextview/src/main/java/uk/co/deanwild/flowtext/helpers/SpanParser.java
rename to flowtextview/src/main/java/uk/co/deanwild/flowtextview/helpers/SpanParser.java
index e431f3a..c3d6f7b 100644
--- a/flowtextview/src/main/java/uk/co/deanwild/flowtext/helpers/SpanParser.java
+++ b/flowtextview/src/main/java/uk/co/deanwild/flowtextview/helpers/SpanParser.java
@@ -1,4 +1,4 @@
-package uk.co.deanwild.flowtext.helpers;
+package uk.co.deanwild.flowtextview.helpers;
 
 import android.graphics.Typeface;
 import android.text.Spannable;
@@ -10,9 +10,9 @@
 import java.util.Arrays;
 import java.util.HashMap;
 
-import uk.co.deanwild.flowtext.FlowTextView;
-import uk.co.deanwild.flowtext.models.HtmlLink;
-import uk.co.deanwild.flowtext.models.HtmlObject;
+import uk.co.deanwild.flowtextview.FlowTextView;
+import uk.co.deanwild.flowtextview.models.HtmlLink;
+import uk.co.deanwild.flowtextview.models.HtmlObject;
 
 /**
  * Created by Dean on 24/06/2014.
diff --git a/flowtextview/src/main/java/uk/co/deanwild/flowtext/listeners/OnLinkClickListener.java b/flowtextview/src/main/java/uk/co/deanwild/flowtextview/listeners/OnLinkClickListener.java
similarity index 72%
rename from flowtextview/src/main/java/uk/co/deanwild/flowtext/listeners/OnLinkClickListener.java
rename to flowtextview/src/main/java/uk/co/deanwild/flowtextview/listeners/OnLinkClickListener.java
index 317c381..94290f3 100644
--- a/flowtextview/src/main/java/uk/co/deanwild/flowtext/listeners/OnLinkClickListener.java
+++ b/flowtextview/src/main/java/uk/co/deanwild/flowtextview/listeners/OnLinkClickListener.java
@@ -1,4 +1,4 @@
-package uk.co.deanwild.flowtext.listeners;
+package uk.co.deanwild.flowtextview.listeners;
 
 /**
 * Created by Dean on 24/06/2014.
diff --git a/flowtextview/src/main/java/uk/co/deanwild/flowtext/models/Area.java b/flowtextview/src/main/java/uk/co/deanwild/flowtextview/models/Area.java
similarity index 74%
rename from flowtextview/src/main/java/uk/co/deanwild/flowtext/models/Area.java
rename to flowtextview/src/main/java/uk/co/deanwild/flowtextview/models/Area.java
index 526ed15..d2bb8e2 100644
--- a/flowtextview/src/main/java/uk/co/deanwild/flowtext/models/Area.java
+++ b/flowtextview/src/main/java/uk/co/deanwild/flowtextview/models/Area.java
@@ -1,4 +1,4 @@
-package uk.co.deanwild.flowtext.models;
+package uk.co.deanwild.flowtextview.models;
 
 /**
 * Created by Dean on 24/06/2014.
diff --git a/flowtextview/src/main/java/uk/co/deanwild/flowtext/models/HtmlLink.java b/flowtextview/src/main/java/uk/co/deanwild/flowtextview/models/HtmlLink.java
similarity index 90%
rename from flowtextview/src/main/java/uk/co/deanwild/flowtext/models/HtmlLink.java
rename to flowtextview/src/main/java/uk/co/deanwild/flowtextview/models/HtmlLink.java
index e45ea92..03c3ff8 100644
--- a/flowtextview/src/main/java/uk/co/deanwild/flowtext/models/HtmlLink.java
+++ b/flowtextview/src/main/java/uk/co/deanwild/flowtextview/models/HtmlLink.java
@@ -1,4 +1,4 @@
-package uk.co.deanwild.flowtext.models;
+package uk.co.deanwild.flowtextview.models;
 
 import android.text.TextPaint;
 
diff --git a/flowtextview/src/main/java/uk/co/deanwild/flowtext/models/HtmlObject.java b/flowtextview/src/main/java/uk/co/deanwild/flowtextview/models/HtmlObject.java
similarity index 92%
rename from flowtextview/src/main/java/uk/co/deanwild/flowtext/models/HtmlObject.java
rename to flowtextview/src/main/java/uk/co/deanwild/flowtextview/models/HtmlObject.java
index 1eb55a8..11dfb99 100644
--- a/flowtextview/src/main/java/uk/co/deanwild/flowtext/models/HtmlObject.java
+++ b/flowtextview/src/main/java/uk/co/deanwild/flowtextview/models/HtmlObject.java
@@ -1,4 +1,4 @@
-package uk.co.deanwild.flowtext.models;
+package uk.co.deanwild.flowtextview.models;
 
 import android.text.TextPaint;
 
diff --git a/flowtextview/src/main/java/uk/co/deanwild/flowtext/models/Line.java b/flowtextview/src/main/java/uk/co/deanwild/flowtextview/models/Line.java
similarity index 73%
rename from flowtextview/src/main/java/uk/co/deanwild/flowtext/models/Line.java
rename to flowtextview/src/main/java/uk/co/deanwild/flowtextview/models/Line.java
index 5a7d62c..a7789d4 100644
--- a/flowtextview/src/main/java/uk/co/deanwild/flowtext/models/Line.java
+++ b/flowtextview/src/main/java/uk/co/deanwild/flowtextview/models/Line.java
@@ -1,4 +1,4 @@
-package uk.co.deanwild.flowtext.models;
+package uk.co.deanwild.flowtextview.models;
 
 /**
 * Created by Dean on 24/06/2014.
diff --git a/flowtextview/src/main/java/uk/co/deanwild/flowtext/models/Obstacle.java b/flowtextview/src/main/java/uk/co/deanwild/flowtextview/models/Obstacle.java
similarity index 79%
rename from flowtextview/src/main/java/uk/co/deanwild/flowtext/models/Obstacle.java
rename to flowtextview/src/main/java/uk/co/deanwild/flowtextview/models/Obstacle.java
index a54f5d4..d531191 100644
--- a/flowtextview/src/main/java/uk/co/deanwild/flowtext/models/Obstacle.java
+++ b/flowtextview/src/main/java/uk/co/deanwild/flowtextview/models/Obstacle.java
@@ -1,4 +1,4 @@
-package uk.co.deanwild.flowtext.models;
+package uk.co.deanwild.flowtextview.models;
 
 /**
 * Created by Dean on 24/06/2014.