diff --git a/.gitignore b/.gitignore
index 3094469..fd02173 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 .DS_Store
 build
+target/
diff --git a/build.xml b/build.xml
index 9f899fe..b8af99d 100644
--- a/build.xml
+++ b/build.xml
@@ -5,16 +5,16 @@
 
     <target name="compile">
         <mkdir dir="${build.dir}"/>
-        <javac srcdir="src/" destdir="${build.dir}" optimize="on" debug="off">
+        <javac srcdir="src/main/java" destdir="${build.dir}" optimize="on" debug="off">
             <include name="**/*.java"/>
         </javac>
 		<copy todir="${build.dir}/" overwrite="yes">
-			<fileset dir="src/">
+         <fileset dir="src/main/java">
 				<include name="*.txt"/>
 			</fileset>
 		 </copy>
 		 <copy todir="${build.dir}/icons" overwrite="yes">
-			<fileset dir="src/icons">
+			<fileset dir="src/main/resources/icons">
 				<include name="*.gif"/>
 			</fileset>
 		 </copy>
diff --git a/compile b/compile
new file mode 100755
index 0000000..b422696
--- /dev/null
+++ b/compile
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+mvn clean install
+mvn dependency:copy-dependencies
diff --git a/execute b/execute
new file mode 100755
index 0000000..58dac53
--- /dev/null
+++ b/execute
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+$JAVA_HOME/bin/java -cp target/SocketTest-3.0-SNAPSHOT.jar:target/dependency/* net.sf.sockettest.SocketTest
diff --git a/lib/metouia.jar b/lib/metouia.jar
deleted file mode 100644
index 16afe7b..0000000
Binary files a/lib/metouia.jar and /dev/null differ
diff --git a/lib/swt-awt-win32-3111.dll b/lib/swt-awt-win32-3111.dll
deleted file mode 100644
index 3144c83..0000000
Binary files a/lib/swt-awt-win32-3111.dll and /dev/null differ
diff --git a/lib/swt-win32-3111.dll b/lib/swt-win32-3111.dll
deleted file mode 100644
index bfe7054..0000000
Binary files a/lib/swt-win32-3111.dll and /dev/null differ
diff --git a/lib/swt.jar b/lib/swt.jar
deleted file mode 100644
index f3cec51..0000000
Binary files a/lib/swt.jar and /dev/null differ
diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml
deleted file mode 100644
index 1be3df8..0000000
--- a/nbproject/build-impl.xml
+++ /dev/null
@@ -1,1041 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-*** GENERATED FROM project.xml - DO NOT EDIT  ***
-***         EDIT ../build.xml INSTEAD         ***
-
-For the purpose of easier reading the script
-is divided into following sections:
-
-  - initialization
-  - compilation
-  - jar
-  - execution
-  - debugging
-  - javadoc
-  - junit compilation
-  - junit execution
-  - junit debugging
-  - applet
-  - cleanup
-
-        -->
-<project xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1" xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3" xmlns:jaxrpc="http://www.netbeans.org/ns/j2se-project/jax-rpc" basedir=".." default="default" name="SocketTest-impl">
-    <fail message="Please build using Ant 1.7.1 or higher.">
-        <condition>
-            <not>
-                <antversion atleast="1.7.1"/>
-            </not>
-        </condition>
-    </fail>
-    <target depends="test,jar,javadoc" description="Build and test whole project." name="default"/>
-    <!-- 
-                ======================
-                INITIALIZATION SECTION 
-                ======================
-            -->
-    <target name="-pre-init">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="-pre-init" name="-init-private">
-        <property file="nbproject/private/config.properties"/>
-        <property file="nbproject/private/configs/${config}.properties"/>
-        <property file="nbproject/private/private.properties"/>
-    </target>
-    <target depends="-pre-init,-init-private" name="-init-user">
-        <property file="${user.properties.file}"/>
-        <!-- The two properties below are usually overridden -->
-        <!-- by the active platform. Just a fallback. -->
-        <property name="default.javac.source" value="1.4"/>
-        <property name="default.javac.target" value="1.4"/>
-    </target>
-    <target depends="-pre-init,-init-private,-init-user" name="-init-project">
-        <property file="nbproject/configs/${config}.properties"/>
-        <property file="nbproject/project.properties"/>
-    </target>
-    <target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property" name="-do-init">
-        <available file="${manifest.file}" property="manifest.available"/>
-        <condition property="splashscreen.available">
-            <and>
-                <not>
-                    <equals arg1="${application.splash}" arg2="" trim="true"/>
-                </not>
-                <available file="${application.splash}"/>
-            </and>
-        </condition>
-        <condition property="main.class.available">
-            <and>
-                <isset property="main.class"/>
-                <not>
-                    <equals arg1="${main.class}" arg2="" trim="true"/>
-                </not>
-            </and>
-        </condition>
-        <condition property="manifest.available+main.class">
-            <and>
-                <isset property="manifest.available"/>
-                <isset property="main.class.available"/>
-            </and>
-        </condition>
-        <condition property="do.archive">
-            <not>
-                <istrue value="${jar.archive.disabled}"/>
-            </not>
-        </condition>
-        <condition property="do.mkdist">
-            <and>
-                <isset property="do.archive"/>
-                <isset property="libs.CopyLibs.classpath"/>
-                <not>
-                    <istrue value="${mkdist.disabled}"/>
-                </not>
-            </and>
-        </condition>
-        <condition property="manifest.available+main.class+mkdist.available">
-            <and>
-                <istrue value="${manifest.available+main.class}"/>
-                <isset property="do.mkdist"/>
-            </and>
-        </condition>
-        <condition property="do.archive+manifest.available">
-            <and>
-                <isset property="manifest.available"/>
-                <istrue value="${do.archive}"/>
-            </and>
-        </condition>
-        <condition property="do.archive+main.class.available">
-            <and>
-                <isset property="main.class.available"/>
-                <istrue value="${do.archive}"/>
-            </and>
-        </condition>
-        <condition property="do.archive+splashscreen.available">
-            <and>
-                <isset property="splashscreen.available"/>
-                <istrue value="${do.archive}"/>
-            </and>
-        </condition>
-        <condition property="do.archive+manifest.available+main.class">
-            <and>
-                <istrue value="${manifest.available+main.class}"/>
-                <istrue value="${do.archive}"/>
-            </and>
-        </condition>
-        <condition property="manifest.available-mkdist.available">
-            <or>
-                <istrue value="${manifest.available}"/>
-                <isset property="do.mkdist"/>
-            </or>
-        </condition>
-        <condition property="manifest.available+main.class-mkdist.available">
-            <or>
-                <istrue value="${manifest.available+main.class}"/>
-                <isset property="do.mkdist"/>
-            </or>
-        </condition>
-        <condition property="have.tests">
-            <or>
-                <available file="${test.src.dir}"/>
-            </or>
-        </condition>
-        <condition property="have.sources">
-            <or>
-                <available file="${src.dir}"/>
-            </or>
-        </condition>
-        <condition property="netbeans.home+have.tests">
-            <and>
-                <isset property="netbeans.home"/>
-                <isset property="have.tests"/>
-            </and>
-        </condition>
-        <condition property="no.javadoc.preview">
-            <and>
-                <isset property="javadoc.preview"/>
-                <isfalse value="${javadoc.preview}"/>
-            </and>
-        </condition>
-        <property name="run.jvmargs" value=""/>
-        <property name="javac.compilerargs" value=""/>
-        <property name="work.dir" value="${basedir}"/>
-        <condition property="no.deps">
-            <and>
-                <istrue value="${no.dependencies}"/>
-            </and>
-        </condition>
-        <property name="javac.debug" value="true"/>
-        <property name="javadoc.preview" value="true"/>
-        <property name="application.args" value=""/>
-        <property name="source.encoding" value="${file.encoding}"/>
-        <property name="runtime.encoding" value="${source.encoding}"/>
-        <condition property="javadoc.encoding.used" value="${javadoc.encoding}">
-            <and>
-                <isset property="javadoc.encoding"/>
-                <not>
-                    <equals arg1="${javadoc.encoding}" arg2=""/>
-                </not>
-            </and>
-        </condition>
-        <property name="javadoc.encoding.used" value="${source.encoding}"/>
-        <property name="includes" value="**"/>
-        <property name="excludes" value=""/>
-        <property name="do.depend" value="false"/>
-        <condition property="do.depend.true">
-            <istrue value="${do.depend}"/>
-        </condition>
-        <path id="endorsed.classpath.path" path="${endorsed.classpath}"/>
-        <condition else="" property="endorsed.classpath.cmd.line.arg" value="-Xbootclasspath/p:'${toString:endorsed.classpath.path}'">
-            <length length="0" string="${endorsed.classpath}" when="greater"/>
-        </condition>
-        <condition else="false" property="jdkBug6558476">
-            <and>
-                <matches pattern="1\.[56]" string="${java.specification.version}"/>
-                <not>
-                    <os family="unix"/>
-                </not>
-            </and>
-        </condition>
-        <property name="javac.fork" value="${jdkBug6558476}"/>
-        <property name="jar.index" value="false"/>
-        <property name="jar.index.metainf" value="${jar.index}"/>
-        <available file="${meta.inf.dir}/persistence.xml" property="has.persistence.xml"/>
-    </target>
-    <target name="-post-init">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init" name="-init-check">
-        <fail unless="src.dir">Must set src.dir</fail>
-        <fail unless="test.src.dir">Must set test.src.dir</fail>
-        <fail unless="build.dir">Must set build.dir</fail>
-        <fail unless="dist.dir">Must set dist.dir</fail>
-        <fail unless="build.classes.dir">Must set build.classes.dir</fail>
-        <fail unless="dist.javadoc.dir">Must set dist.javadoc.dir</fail>
-        <fail unless="build.test.classes.dir">Must set build.test.classes.dir</fail>
-        <fail unless="build.test.results.dir">Must set build.test.results.dir</fail>
-        <fail unless="build.classes.excludes">Must set build.classes.excludes</fail>
-        <fail unless="dist.jar">Must set dist.jar</fail>
-    </target>
-    <target name="-init-macrodef-property">
-        <macrodef name="property" uri="http://www.netbeans.org/ns/j2se-project/1">
-            <attribute name="name"/>
-            <attribute name="value"/>
-            <sequential>
-                <property name="@{name}" value="${@{value}}"/>
-            </sequential>
-        </macrodef>
-    </target>
-    <target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-macrodef-javac-with-processors">
-        <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${src.dir}" name="srcdir"/>
-            <attribute default="${build.classes.dir}" name="destdir"/>
-            <attribute default="${javac.classpath}" name="classpath"/>
-            <attribute default="${javac.processorpath}" name="processorpath"/>
-            <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/>
-            <attribute default="${includes}" name="includes"/>
-            <attribute default="${excludes}" name="excludes"/>
-            <attribute default="${javac.debug}" name="debug"/>
-            <attribute default="${empty.dir}" name="sourcepath"/>
-            <attribute default="${empty.dir}" name="gensrcdir"/>
-            <element name="customize" optional="true"/>
-            <sequential>
-                <property location="${build.dir}/empty" name="empty.dir"/>
-                <mkdir dir="${empty.dir}"/>
-                <mkdir dir="@{apgeneratedsrcdir}"/>
-                <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" fork="${javac.fork}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}">
-                    <src>
-                        <dirset dir="@{gensrcdir}" erroronmissingdir="false">
-                            <include name="*"/>
-                        </dirset>
-                    </src>
-                    <classpath>
-                        <path path="@{classpath}"/>
-                    </classpath>
-                    <compilerarg line="${endorsed.classpath.cmd.line.arg}"/>
-                    <compilerarg line="${javac.compilerargs}"/>
-                    <compilerarg value="-processorpath"/>
-                    <compilerarg path="@{processorpath}:${empty.dir}"/>
-                    <compilerarg line="${ap.processors.internal}"/>
-                    <compilerarg line="${annotation.processing.processor.options}"/>
-                    <compilerarg value="-s"/>
-                    <compilerarg path="@{apgeneratedsrcdir}"/>
-                    <compilerarg line="${ap.proc.none.internal}"/>
-                    <customize/>
-                </javac>
-            </sequential>
-        </macrodef>
-    </target>
-    <target depends="-init-ap-cmdline-properties" name="-init-macrodef-javac-without-processors" unless="ap.supported.internal">
-        <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${src.dir}" name="srcdir"/>
-            <attribute default="${build.classes.dir}" name="destdir"/>
-            <attribute default="${javac.classpath}" name="classpath"/>
-            <attribute default="${javac.processorpath}" name="processorpath"/>
-            <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/>
-            <attribute default="${includes}" name="includes"/>
-            <attribute default="${excludes}" name="excludes"/>
-            <attribute default="${javac.debug}" name="debug"/>
-            <attribute default="${empty.dir}" name="sourcepath"/>
-            <attribute default="${empty.dir}" name="gensrcdir"/>
-            <element name="customize" optional="true"/>
-            <sequential>
-                <property location="${build.dir}/empty" name="empty.dir"/>
-                <mkdir dir="${empty.dir}"/>
-                <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" fork="${javac.fork}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}">
-                    <src>
-                        <dirset dir="@{gensrcdir}" erroronmissingdir="false">
-                            <include name="*"/>
-                        </dirset>
-                    </src>
-                    <classpath>
-                        <path path="@{classpath}"/>
-                    </classpath>
-                    <compilerarg line="${endorsed.classpath.cmd.line.arg}"/>
-                    <compilerarg line="${javac.compilerargs}"/>
-                    <customize/>
-                </javac>
-            </sequential>
-        </macrodef>
-    </target>
-    <target depends="-init-macrodef-javac-with-processors,-init-macrodef-javac-without-processors" name="-init-macrodef-javac">
-        <macrodef name="depend" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${src.dir}" name="srcdir"/>
-            <attribute default="${build.classes.dir}" name="destdir"/>
-            <attribute default="${javac.classpath}" name="classpath"/>
-            <sequential>
-                <depend cache="${build.dir}/depcache" destdir="@{destdir}" excludes="${excludes}" includes="${includes}" srcdir="@{srcdir}">
-                    <classpath>
-                        <path path="@{classpath}"/>
-                    </classpath>
-                </depend>
-            </sequential>
-        </macrodef>
-        <macrodef name="force-recompile" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${build.classes.dir}" name="destdir"/>
-            <sequential>
-                <fail unless="javac.includes">Must set javac.includes</fail>
-                <pathconvert pathsep="${line.separator}" property="javac.includes.binary">
-                    <path>
-                        <filelist dir="@{destdir}" files="${javac.includes}"/>
-                    </path>
-                    <globmapper from="*.java" to="*.class"/>
-                </pathconvert>
-                <tempfile deleteonexit="true" property="javac.includesfile.binary"/>
-                <echo file="${javac.includesfile.binary}" message="${javac.includes.binary}"/>
-                <delete>
-                    <files includesfile="${javac.includesfile.binary}"/>
-                </delete>
-                <delete>
-                    <fileset file="${javac.includesfile.binary}"/>
-                </delete>
-            </sequential>
-        </macrodef>
-    </target>
-    <target name="-init-macrodef-junit">
-        <macrodef name="junit" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${includes}" name="includes"/>
-            <attribute default="${excludes}" name="excludes"/>
-            <attribute default="**" name="testincludes"/>
-            <sequential>
-                <property name="junit.forkmode" value="perTest"/>
-                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
-                    <batchtest todir="${build.test.results.dir}">
-                        <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
-                            <filename name="@{testincludes}"/>
-                        </fileset>
-                    </batchtest>
-                    <classpath>
-                        <path path="${run.test.classpath}"/>
-                    </classpath>
-                    <syspropertyset>
-                        <propertyref prefix="test-sys-prop."/>
-                        <mapper from="test-sys-prop.*" to="*" type="glob"/>
-                    </syspropertyset>
-                    <formatter type="brief" usefile="false"/>
-                    <formatter type="xml"/>
-                    <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
-                    <jvmarg value="-ea"/>
-                    <jvmarg line="${run.jvmargs}"/>
-                </junit>
-            </sequential>
-        </macrodef>
-    </target>
-    <target depends="-profile-pre-init, init, -profile-post-init, -profile-init-macrodef-profile, -profile-init-check" name="profile-init"/>
-    <target name="-profile-pre-init">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target name="-profile-post-init">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target name="-profile-init-macrodef-profile">
-        <macrodef name="resolve">
-            <attribute name="name"/>
-            <attribute name="value"/>
-            <sequential>
-                <property name="@{name}" value="${env.@{value}}"/>
-            </sequential>
-        </macrodef>
-        <macrodef name="profile">
-            <attribute default="${main.class}" name="classname"/>
-            <element name="customize" optional="true"/>
-            <sequential>
-                <property environment="env"/>
-                <resolve name="profiler.current.path" value="${profiler.info.pathvar}"/>
-                <java classname="@{classname}" dir="${profiler.info.dir}" fork="true" jvm="${profiler.info.jvm}">
-                    <jvmarg value="${profiler.info.jvmargs.agent}"/>
-                    <jvmarg line="${profiler.info.jvmargs}"/>
-                    <env key="${profiler.info.pathvar}" path="${profiler.info.agentpath}:${profiler.current.path}"/>
-                    <arg line="${application.args}"/>
-                    <classpath>
-                        <path path="${run.classpath}"/>
-                    </classpath>
-                    <syspropertyset>
-                        <propertyref prefix="run-sys-prop."/>
-                        <mapper from="run-sys-prop.*" to="*" type="glob"/>
-                    </syspropertyset>
-                    <customize/>
-                </java>
-            </sequential>
-        </macrodef>
-    </target>
-    <target depends="-profile-pre-init, init, -profile-post-init, -profile-init-macrodef-profile" name="-profile-init-check">
-        <fail unless="profiler.info.jvm">Must set JVM to use for profiling in profiler.info.jvm</fail>
-        <fail unless="profiler.info.jvmargs.agent">Must set profiler agent JVM arguments in profiler.info.jvmargs.agent</fail>
-    </target>
-    <target depends="-init-debug-args" name="-init-macrodef-nbjpda">
-        <macrodef name="nbjpdastart" uri="http://www.netbeans.org/ns/j2se-project/1">
-            <attribute default="${main.class}" name="name"/>
-            <attribute default="${debug.classpath}" name="classpath"/>
-            <attribute default="" name="stopclassname"/>
-            <sequential>
-                <nbjpdastart addressproperty="jpda.address" name="@{name}" stopclassname="@{stopclassname}" transport="${debug-transport}">
-                    <classpath>
-                        <path path="@{classpath}"/>
-                    </classpath>
-                </nbjpdastart>
-            </sequential>
-        </macrodef>
-        <macrodef name="nbjpdareload" uri="http://www.netbeans.org/ns/j2se-project/1">
-            <attribute default="${build.classes.dir}" name="dir"/>
-            <sequential>
-                <nbjpdareload>
-                    <fileset dir="@{dir}" includes="${fix.classes}">
-                        <include name="${fix.includes}*.class"/>
-                    </fileset>
-                </nbjpdareload>
-            </sequential>
-        </macrodef>
-    </target>
-    <target name="-init-debug-args">
-        <property name="version-output" value="java version &quot;${ant.java.version}"/>
-        <condition property="have-jdk-older-than-1.4">
-            <or>
-                <contains string="${version-output}" substring="java version &quot;1.0"/>
-                <contains string="${version-output}" substring="java version &quot;1.1"/>
-                <contains string="${version-output}" substring="java version &quot;1.2"/>
-                <contains string="${version-output}" substring="java version &quot;1.3"/>
-            </or>
-        </condition>
-        <condition else="-Xdebug" property="debug-args-line" value="-Xdebug -Xnoagent -Djava.compiler=none">
-            <istrue value="${have-jdk-older-than-1.4}"/>
-        </condition>
-        <condition else="dt_socket" property="debug-transport-by-os" value="dt_shmem">
-            <os family="windows"/>
-        </condition>
-        <condition else="${debug-transport-by-os}" property="debug-transport" value="${debug.transport}">
-            <isset property="debug.transport"/>
-        </condition>
-    </target>
-    <target depends="-init-debug-args" name="-init-macrodef-debug">
-        <macrodef name="debug" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${main.class}" name="classname"/>
-            <attribute default="${debug.classpath}" name="classpath"/>
-            <element name="customize" optional="true"/>
-            <sequential>
-                <java classname="@{classname}" dir="${work.dir}" fork="true">
-                    <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
-                    <jvmarg line="${debug-args-line}"/>
-                    <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
-                    <jvmarg value="-Dfile.encoding=${runtime.encoding}"/>
-                    <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>
-                    <jvmarg line="${run.jvmargs}"/>
-                    <classpath>
-                        <path path="@{classpath}"/>
-                    </classpath>
-                    <syspropertyset>
-                        <propertyref prefix="run-sys-prop."/>
-                        <mapper from="run-sys-prop.*" to="*" type="glob"/>
-                    </syspropertyset>
-                    <customize/>
-                </java>
-            </sequential>
-        </macrodef>
-    </target>
-    <target name="-init-macrodef-java">
-        <macrodef name="java" uri="http://www.netbeans.org/ns/j2se-project/1">
-            <attribute default="${main.class}" name="classname"/>
-            <attribute default="${run.classpath}" name="classpath"/>
-            <element name="customize" optional="true"/>
-            <sequential>
-                <java classname="@{classname}" dir="${work.dir}" fork="true">
-                    <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
-                    <jvmarg value="-Dfile.encoding=${runtime.encoding}"/>
-                    <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>
-                    <jvmarg line="${run.jvmargs}"/>
-                    <classpath>
-                        <path path="@{classpath}"/>
-                    </classpath>
-                    <syspropertyset>
-                        <propertyref prefix="run-sys-prop."/>
-                        <mapper from="run-sys-prop.*" to="*" type="glob"/>
-                    </syspropertyset>
-                    <customize/>
-                </java>
-            </sequential>
-        </macrodef>
-    </target>
-    <target name="-init-macrodef-copylibs">
-        <macrodef name="copylibs" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${manifest.file}" name="manifest"/>
-            <element name="customize" optional="true"/>
-            <sequential>
-                <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
-                <pathconvert property="run.classpath.without.build.classes.dir">
-                    <path path="${run.classpath}"/>
-                    <map from="${build.classes.dir.resolved}" to=""/>
-                </pathconvert>
-                <pathconvert pathsep=" " property="jar.classpath">
-                    <path path="${run.classpath.without.build.classes.dir}"/>
-                    <chainedmapper>
-                        <flattenmapper/>
-                        <globmapper from="*" to="lib/*"/>
-                    </chainedmapper>
-                </pathconvert>
-                <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>
-                <copylibs compress="${jar.compress}" index="${jar.index}" indexMetaInf="${jar.index.metainf}" jarfile="${dist.jar}" manifest="@{manifest}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
-                    <fileset dir="${build.classes.dir}"/>
-                    <manifest>
-                        <attribute name="Class-Path" value="${jar.classpath}"/>
-                        <customize/>
-                    </manifest>
-                </copylibs>
-            </sequential>
-        </macrodef>
-    </target>
-    <target name="-init-presetdef-jar">
-        <presetdef name="jar" uri="http://www.netbeans.org/ns/j2se-project/1">
-            <jar compress="${jar.compress}" index="${jar.index}" jarfile="${dist.jar}">
-                <j2seproject1:fileset dir="${build.classes.dir}"/>
-            </jar>
-        </presetdef>
-    </target>
-    <target name="-init-ap-cmdline-properties">
-        <property name="annotation.processing.enabled" value="true"/>
-        <property name="annotation.processing.processors.list" value=""/>
-        <property name="annotation.processing.processor.options" value=""/>
-        <property name="annotation.processing.run.all.processors" value="true"/>
-        <property name="javac.processorpath" value="${javac.classpath}"/>
-        <property name="javac.test.processorpath" value="${javac.test.classpath}"/>
-        <condition property="ap.supported.internal" value="true">
-            <not>
-                <matches pattern="1\.[0-5](\..*)?" string="${javac.source}"/>
-            </not>
-        </condition>
-    </target>
-    <target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-ap-cmdline-supported">
-        <condition else="" property="ap.processors.internal" value="-processor ${annotation.processing.processors.list}">
-            <isfalse value="${annotation.processing.run.all.processors}"/>
-        </condition>
-        <condition else="" property="ap.proc.none.internal" value="-proc:none">
-            <isfalse value="${annotation.processing.enabled}"/>
-        </condition>
-    </target>
-    <target depends="-init-ap-cmdline-properties,-init-ap-cmdline-supported" name="-init-ap-cmdline">
-        <property name="ap.cmd.line.internal" value=""/>
-    </target>
-    <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init,-post-init,-init-check,-init-macrodef-property,-init-macrodef-javac,-init-macrodef-junit,-init-macrodef-nbjpda,-init-macrodef-debug,-init-macrodef-java,-init-presetdef-jar,-init-ap-cmdline" name="init"/>
-    <!--
-                ===================
-                COMPILATION SECTION
-                ===================
-            -->
-    <target name="-deps-jar-init" unless="built-jar.properties">
-        <property location="${build.dir}/built-jar.properties" name="built-jar.properties"/>
-        <delete file="${built-jar.properties}" quiet="true"/>
-    </target>
-    <target if="already.built.jar.${basedir}" name="-warn-already-built-jar">
-        <echo level="warn" message="Cycle detected: SocketTest was already built"/>
-    </target>
-    <target depends="init,-deps-jar-init" name="deps-jar" unless="no.deps">
-        <mkdir dir="${build.dir}"/>
-        <touch file="${built-jar.properties}" verbose="false"/>
-        <property file="${built-jar.properties}" prefix="already.built.jar."/>
-        <antcall target="-warn-already-built-jar"/>
-        <propertyfile file="${built-jar.properties}">
-            <entry key="${basedir}" value=""/>
-        </propertyfile>
-    </target>
-    <target depends="init,-check-automatic-build,-clean-after-automatic-build" name="-verify-automatic-build"/>
-    <target depends="init" name="-check-automatic-build">
-        <available file="${build.classes.dir}/.netbeans_automatic_build" property="netbeans.automatic.build"/>
-    </target>
-    <target depends="init" if="netbeans.automatic.build" name="-clean-after-automatic-build">
-        <antcall target="clean"/>
-    </target>
-    <target depends="init,deps-jar" name="-pre-pre-compile">
-        <mkdir dir="${build.classes.dir}"/>
-    </target>
-    <target name="-pre-compile">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target if="do.depend.true" name="-compile-depend">
-        <pathconvert property="build.generated.subdirs">
-            <dirset dir="${build.generated.sources.dir}" erroronmissingdir="false">
-                <include name="*"/>
-            </dirset>
-        </pathconvert>
-        <j2seproject3:depend srcdir="${src.dir}:${build.generated.subdirs}"/>
-    </target>
-    <target depends="init,deps-jar,-pre-pre-compile,-pre-compile, -copy-persistence-xml,-compile-depend" if="have.sources" name="-do-compile">
-        <j2seproject3:javac gensrcdir="${build.generated.sources.dir}"/>
-        <copy todir="${build.classes.dir}">
-            <fileset dir="${src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
-        </copy>
-    </target>
-    <target if="has.persistence.xml" name="-copy-persistence-xml">
-        <mkdir dir="${build.classes.dir}/META-INF"/>
-        <copy todir="${build.classes.dir}/META-INF">
-            <fileset dir="${meta.inf.dir}" includes="persistence.xml"/>
-        </copy>
-    </target>
-    <target name="-post-compile">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="init,deps-jar,-verify-automatic-build,-pre-pre-compile,-pre-compile,-do-compile,-post-compile" description="Compile project." name="compile"/>
-    <target name="-pre-compile-single">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="init,deps-jar,-pre-pre-compile" name="-do-compile-single">
-        <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
-        <j2seproject3:force-recompile/>
-        <j2seproject3:javac excludes="" gensrcdir="${build.generated.sources.dir}" includes="${javac.includes}" sourcepath="${src.dir}"/>
-    </target>
-    <target name="-post-compile-single">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="init,deps-jar,-verify-automatic-build,-pre-pre-compile,-pre-compile-single,-do-compile-single,-post-compile-single" name="compile-single"/>
-    <!--
-                ====================
-                JAR BUILDING SECTION
-                ====================
-            -->
-    <target depends="init" name="-pre-pre-jar">
-        <dirname file="${dist.jar}" property="dist.jar.dir"/>
-        <mkdir dir="${dist.jar.dir}"/>
-    </target>
-    <target name="-pre-jar">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="init,compile,-pre-pre-jar,-pre-jar" if="do.archive" name="-do-jar-without-manifest" unless="manifest.available-mkdist.available">
-        <j2seproject1:jar/>
-    </target>
-    <target depends="init,compile,-pre-pre-jar,-pre-jar" if="do.archive+manifest.available" name="-do-jar-with-manifest" unless="manifest.available+main.class-mkdist.available">
-        <j2seproject1:jar manifest="${manifest.file}"/>
-    </target>
-    <target depends="init,compile,-pre-pre-jar,-pre-jar" if="do.archive+manifest.available+main.class" name="-do-jar-with-mainclass" unless="manifest.available+main.class+mkdist.available">
-        <j2seproject1:jar manifest="${manifest.file}">
-            <j2seproject1:manifest>
-                <j2seproject1:attribute name="Main-Class" value="${main.class}"/>
-            </j2seproject1:manifest>
-        </j2seproject1:jar>
-        <echo level="info">To run this application from the command line without Ant, try:</echo>
-        <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
-        <property location="${dist.jar}" name="dist.jar.resolved"/>
-        <pathconvert property="run.classpath.with.dist.jar">
-            <path path="${run.classpath}"/>
-            <map from="${build.classes.dir.resolved}" to="${dist.jar.resolved}"/>
-        </pathconvert>
-        <echo level="info">java -cp "${run.classpath.with.dist.jar}" ${main.class}</echo>
-    </target>
-    <target depends="init" if="do.archive" name="-do-jar-with-libraries-create-manifest" unless="manifest.available">
-        <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/>
-        <touch file="${tmp.manifest.file}" verbose="false"/>
-    </target>
-    <target depends="init" if="do.archive+manifest.available" name="-do-jar-with-libraries-copy-manifest">
-        <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/>
-        <copy file="${manifest.file}" tofile="${tmp.manifest.file}"/>
-    </target>
-    <target depends="init,-do-jar-with-libraries-create-manifest,-do-jar-with-libraries-copy-manifest" if="do.archive+main.class.available" name="-do-jar-with-libraries-set-main">
-        <manifest file="${tmp.manifest.file}" mode="update">
-            <attribute name="Main-Class" value="${main.class}"/>
-        </manifest>
-    </target>
-    <target depends="init,-do-jar-with-libraries-create-manifest,-do-jar-with-libraries-copy-manifest" if="do.archive+splashscreen.available" name="-do-jar-with-libraries-set-splashscreen">
-        <basename file="${application.splash}" property="splashscreen.basename"/>
-        <mkdir dir="${build.classes.dir}/META-INF"/>
-        <copy failonerror="false" file="${application.splash}" todir="${build.classes.dir}/META-INF"/>
-        <manifest file="${tmp.manifest.file}" mode="update">
-            <attribute name="SplashScreen-Image" value="META-INF/${splashscreen.basename}"/>
-        </manifest>
-    </target>
-    <target depends="init,-init-macrodef-copylibs,compile,-pre-pre-jar,-pre-jar,-do-jar-with-libraries-create-manifest,-do-jar-with-libraries-copy-manifest,-do-jar-with-libraries-set-main,-do-jar-with-libraries-set-splashscreen" if="do.mkdist" name="-do-jar-with-libraries-pack">
-        <j2seproject3:copylibs manifest="${tmp.manifest.file}"/>
-        <echo level="info">To run this application from the command line without Ant, try:</echo>
-        <property location="${dist.jar}" name="dist.jar.resolved"/>
-        <echo level="info">java -jar "${dist.jar.resolved}"</echo>
-    </target>
-    <target depends="-do-jar-with-libraries-pack" if="do.archive" name="-do-jar-with-libraries-delete-manifest">
-        <delete>
-            <fileset file="${tmp.manifest.file}"/>
-        </delete>
-    </target>
-    <target depends="init,compile,-pre-pre-jar,-pre-jar,-do-jar-with-libraries-create-manifest,-do-jar-with-libraries-copy-manifest,-do-jar-with-libraries-set-main,-do-jar-with-libraries-set-splashscreen,-do-jar-with-libraries-pack,-do-jar-with-libraries-delete-manifest" name="-do-jar-with-libraries"/>
-    <target name="-post-jar">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="init,compile,-pre-jar,-do-jar-with-manifest,-do-jar-without-manifest,-do-jar-with-mainclass,-do-jar-with-libraries,-post-jar" description="Build JAR." name="jar"/>
-    <!--
-                =================
-                EXECUTION SECTION
-                =================
-            -->
-    <target depends="init,compile" description="Run a main class." name="run">
-        <j2seproject1:java>
-            <customize>
-                <arg line="${application.args}"/>
-            </customize>
-        </j2seproject1:java>
-    </target>
-    <target name="-do-not-recompile">
-        <property name="javac.includes.binary" value=""/>
-    </target>
-    <target depends="init,compile-single" name="run-single">
-        <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
-        <j2seproject1:java classname="${run.class}"/>
-    </target>
-    <target depends="init,compile-test-single" name="run-test-with-main">
-        <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
-        <j2seproject1:java classname="${run.class}" classpath="${run.test.classpath}"/>
-    </target>
-    <!--
-                =================
-                DEBUGGING SECTION
-                =================
-            -->
-    <target depends="init" if="netbeans.home" name="-debug-start-debugger">
-        <j2seproject1:nbjpdastart name="${debug.class}"/>
-    </target>
-    <target depends="init" if="netbeans.home" name="-debug-start-debugger-main-test">
-        <j2seproject1:nbjpdastart classpath="${debug.test.classpath}" name="${debug.class}"/>
-    </target>
-    <target depends="init,compile" name="-debug-start-debuggee">
-        <j2seproject3:debug>
-            <customize>
-                <arg line="${application.args}"/>
-            </customize>
-        </j2seproject3:debug>
-    </target>
-    <target depends="init,compile,-debug-start-debugger,-debug-start-debuggee" description="Debug project in IDE." if="netbeans.home" name="debug"/>
-    <target depends="init" if="netbeans.home" name="-debug-start-debugger-stepinto">
-        <j2seproject1:nbjpdastart stopclassname="${main.class}"/>
-    </target>
-    <target depends="init,compile,-debug-start-debugger-stepinto,-debug-start-debuggee" if="netbeans.home" name="debug-stepinto"/>
-    <target depends="init,compile-single" if="netbeans.home" name="-debug-start-debuggee-single">
-        <fail unless="debug.class">Must select one file in the IDE or set debug.class</fail>
-        <j2seproject3:debug classname="${debug.class}"/>
-    </target>
-    <target depends="init,compile-single,-debug-start-debugger,-debug-start-debuggee-single" if="netbeans.home" name="debug-single"/>
-    <target depends="init,compile-test-single" if="netbeans.home" name="-debug-start-debuggee-main-test">
-        <fail unless="debug.class">Must select one file in the IDE or set debug.class</fail>
-        <j2seproject3:debug classname="${debug.class}" classpath="${debug.test.classpath}"/>
-    </target>
-    <target depends="init,compile-test-single,-debug-start-debugger-main-test,-debug-start-debuggee-main-test" if="netbeans.home" name="debug-test-with-main"/>
-    <target depends="init" name="-pre-debug-fix">
-        <fail unless="fix.includes">Must set fix.includes</fail>
-        <property name="javac.includes" value="${fix.includes}.java"/>
-    </target>
-    <target depends="init,-pre-debug-fix,compile-single" if="netbeans.home" name="-do-debug-fix">
-        <j2seproject1:nbjpdareload/>
-    </target>
-    <target depends="init,-pre-debug-fix,-do-debug-fix" if="netbeans.home" name="debug-fix"/>
-    <!--
-                =================
-                PROFILING SECTION
-                =================
-            -->
-    <target depends="profile-init,compile" description="Profile a project in the IDE." if="netbeans.home" name="profile">
-        <nbprofiledirect>
-            <classpath>
-                <path path="${run.classpath}"/>
-            </classpath>
-        </nbprofiledirect>
-        <profile/>
-    </target>
-    <target depends="profile-init,compile-single" description="Profile a selected class in the IDE." if="netbeans.home" name="profile-single">
-        <fail unless="profile.class">Must select one file in the IDE or set profile.class</fail>
-        <nbprofiledirect>
-            <classpath>
-                <path path="${run.classpath}"/>
-            </classpath>
-        </nbprofiledirect>
-        <profile classname="${profile.class}"/>
-    </target>
-    <!--
-                =========================
-                APPLET PROFILING  SECTION
-                =========================
-            -->
-    <target depends="profile-init,compile-single" if="netbeans.home" name="profile-applet">
-        <nbprofiledirect>
-            <classpath>
-                <path path="${run.classpath}"/>
-            </classpath>
-        </nbprofiledirect>
-        <profile classname="sun.applet.AppletViewer">
-            <customize>
-                <arg value="${applet.url}"/>
-            </customize>
-        </profile>
-    </target>
-    <!--
-                =========================
-                TESTS PROFILING  SECTION
-                =========================
-            -->
-    <target depends="profile-init,compile-test-single" if="netbeans.home" name="profile-test-single">
-        <nbprofiledirect>
-            <classpath>
-                <path path="${run.test.classpath}"/>
-            </classpath>
-        </nbprofiledirect>
-        <junit dir="${profiler.info.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" jvm="${profiler.info.jvm}" showoutput="true">
-            <env key="${profiler.info.pathvar}" path="${profiler.info.agentpath}:${profiler.current.path}"/>
-            <jvmarg value="${profiler.info.jvmargs.agent}"/>
-            <jvmarg line="${profiler.info.jvmargs}"/>
-            <test name="${profile.class}"/>
-            <classpath>
-                <path path="${run.test.classpath}"/>
-            </classpath>
-            <syspropertyset>
-                <propertyref prefix="test-sys-prop."/>
-                <mapper from="test-sys-prop.*" to="*" type="glob"/>
-            </syspropertyset>
-            <formatter type="brief" usefile="false"/>
-            <formatter type="xml"/>
-        </junit>
-    </target>
-    <!--
-                ===============
-                JAVADOC SECTION
-                ===============
-            -->
-    <target depends="init" if="have.sources" name="-javadoc-build">
-        <mkdir dir="${dist.javadoc.dir}"/>
-        <javadoc additionalparam="${javadoc.additionalparam}" author="${javadoc.author}" charset="UTF-8" destdir="${dist.javadoc.dir}" docencoding="UTF-8" encoding="${javadoc.encoding.used}" failonerror="true" noindex="${javadoc.noindex}" nonavbar="${javadoc.nonavbar}" notree="${javadoc.notree}" private="${javadoc.private}" source="${javac.source}" splitindex="${javadoc.splitindex}" use="${javadoc.use}" useexternalfile="true" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}">
-            <classpath>
-                <path path="${javac.classpath}"/>
-            </classpath>
-            <fileset dir="${src.dir}" excludes="${excludes}" includes="${includes}">
-                <filename name="**/*.java"/>
-            </fileset>
-            <fileset dir="${build.generated.sources.dir}" erroronmissingdir="false">
-                <include name="**/*.java"/>
-            </fileset>
-        </javadoc>
-        <copy todir="${dist.javadoc.dir}">
-            <fileset dir="${src.dir}" excludes="${excludes}" includes="${includes}">
-                <filename name="**/doc-files/**"/>
-            </fileset>
-            <fileset dir="${build.generated.sources.dir}" erroronmissingdir="false">
-                <include name="**/doc-files/**"/>
-            </fileset>
-        </copy>
-    </target>
-    <target depends="init,-javadoc-build" if="netbeans.home" name="-javadoc-browse" unless="no.javadoc.preview">
-        <nbbrowse file="${dist.javadoc.dir}/index.html"/>
-    </target>
-    <target depends="init,-javadoc-build,-javadoc-browse" description="Build Javadoc." name="javadoc"/>
-    <!--
-                =========================
-                JUNIT COMPILATION SECTION
-                =========================
-            -->
-    <target depends="init,compile" if="have.tests" name="-pre-pre-compile-test">
-        <mkdir dir="${build.test.classes.dir}"/>
-    </target>
-    <target name="-pre-compile-test">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target if="do.depend.true" name="-compile-test-depend">
-        <j2seproject3:depend classpath="${javac.test.classpath}" destdir="${build.test.classes.dir}" srcdir="${test.src.dir}"/>
-    </target>
-    <target depends="init,deps-jar,compile,-pre-pre-compile-test,-pre-compile-test,-compile-test-depend" if="have.tests" name="-do-compile-test">
-        <j2seproject3:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" processorpath="${javac.test.processorpath}" srcdir="${test.src.dir}"/>
-        <copy todir="${build.test.classes.dir}">
-            <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
-        </copy>
-    </target>
-    <target name="-post-compile-test">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test,-do-compile-test,-post-compile-test" name="compile-test"/>
-    <target name="-pre-compile-test-single">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="init,deps-jar,compile,-pre-pre-compile-test,-pre-compile-test-single" if="have.tests" name="-do-compile-test-single">
-        <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
-        <j2seproject3:force-recompile destdir="${build.test.classes.dir}"/>
-        <j2seproject3:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" excludes="" includes="${javac.includes}" processorpath="${javac.test.processorpath}" sourcepath="${test.src.dir}" srcdir="${test.src.dir}"/>
-        <copy todir="${build.test.classes.dir}">
-            <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
-        </copy>
-    </target>
-    <target name="-post-compile-test-single">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single,-do-compile-test-single,-post-compile-test-single" name="compile-test-single"/>
-    <!--
-                =======================
-                JUNIT EXECUTION SECTION
-                =======================
-            -->
-    <target depends="init" if="have.tests" name="-pre-test-run">
-        <mkdir dir="${build.test.results.dir}"/>
-    </target>
-    <target depends="init,compile-test,-pre-test-run" if="have.tests" name="-do-test-run">
-        <j2seproject3:junit testincludes="**/*Test.java"/>
-    </target>
-    <target depends="init,compile-test,-pre-test-run,-do-test-run" if="have.tests" name="-post-test-run">
-        <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
-    </target>
-    <target depends="init" if="have.tests" name="test-report"/>
-    <target depends="init" if="netbeans.home+have.tests" name="-test-browse"/>
-    <target depends="init,compile-test,-pre-test-run,-do-test-run,test-report,-post-test-run,-test-browse" description="Run unit tests." name="test"/>
-    <target depends="init" if="have.tests" name="-pre-test-run-single">
-        <mkdir dir="${build.test.results.dir}"/>
-    </target>
-    <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-do-test-run-single">
-        <fail unless="test.includes">Must select some files in the IDE or set test.includes</fail>
-        <j2seproject3:junit excludes="" includes="${test.includes}"/>
-    </target>
-    <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single" if="have.tests" name="-post-test-run-single">
-        <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
-    </target>
-    <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single,-post-test-run-single" description="Run single unit test." name="test-single"/>
-    <!--
-                =======================
-                JUNIT DEBUGGING SECTION
-                =======================
-            -->
-    <target depends="init,compile-test" if="have.tests" name="-debug-start-debuggee-test">
-        <fail unless="test.class">Must select one file in the IDE or set test.class</fail>
-        <property location="${build.test.results.dir}/TEST-${test.class}.xml" name="test.report.file"/>
-        <delete file="${test.report.file}"/>
-        <mkdir dir="${build.test.results.dir}"/>
-        <j2seproject3:debug classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner" classpath="${ant.home}/lib/ant.jar:${ant.home}/lib/ant-junit.jar:${debug.test.classpath}">
-            <customize>
-                <syspropertyset>
-                    <propertyref prefix="test-sys-prop."/>
-                    <mapper from="test-sys-prop.*" to="*" type="glob"/>
-                </syspropertyset>
-                <arg value="${test.class}"/>
-                <arg value="showoutput=true"/>
-                <arg value="formatter=org.apache.tools.ant.taskdefs.optional.junit.BriefJUnitResultFormatter"/>
-                <arg value="formatter=org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter,${test.report.file}"/>
-            </customize>
-        </j2seproject3:debug>
-    </target>
-    <target depends="init,compile-test" if="netbeans.home+have.tests" name="-debug-start-debugger-test">
-        <j2seproject1:nbjpdastart classpath="${debug.test.classpath}" name="${test.class}"/>
-    </target>
-    <target depends="init,compile-test-single,-debug-start-debugger-test,-debug-start-debuggee-test" name="debug-test"/>
-    <target depends="init,-pre-debug-fix,compile-test-single" if="netbeans.home" name="-do-debug-fix-test">
-        <j2seproject1:nbjpdareload dir="${build.test.classes.dir}"/>
-    </target>
-    <target depends="init,-pre-debug-fix,-do-debug-fix-test" if="netbeans.home" name="debug-fix-test"/>
-    <!--
-                =========================
-                APPLET EXECUTION SECTION
-                =========================
-            -->
-    <target depends="init,compile-single" name="run-applet">
-        <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>
-        <j2seproject1:java classname="sun.applet.AppletViewer">
-            <customize>
-                <arg value="${applet.url}"/>
-            </customize>
-        </j2seproject1:java>
-    </target>
-    <!--
-                =========================
-                APPLET DEBUGGING  SECTION
-                =========================
-            -->
-    <target depends="init,compile-single" if="netbeans.home" name="-debug-start-debuggee-applet">
-        <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>
-        <j2seproject3:debug classname="sun.applet.AppletViewer">
-            <customize>
-                <arg value="${applet.url}"/>
-            </customize>
-        </j2seproject3:debug>
-    </target>
-    <target depends="init,compile-single,-debug-start-debugger,-debug-start-debuggee-applet" if="netbeans.home" name="debug-applet"/>
-    <!--
-                ===============
-                CLEANUP SECTION
-                ===============
-            -->
-    <target name="-deps-clean-init" unless="built-clean.properties">
-        <property location="${build.dir}/built-clean.properties" name="built-clean.properties"/>
-        <delete file="${built-clean.properties}" quiet="true"/>
-    </target>
-    <target if="already.built.clean.${basedir}" name="-warn-already-built-clean">
-        <echo level="warn" message="Cycle detected: SocketTest was already built"/>
-    </target>
-    <target depends="init,-deps-clean-init" name="deps-clean" unless="no.deps">
-        <mkdir dir="${build.dir}"/>
-        <touch file="${built-clean.properties}" verbose="false"/>
-        <property file="${built-clean.properties}" prefix="already.built.clean."/>
-        <antcall target="-warn-already-built-clean"/>
-        <propertyfile file="${built-clean.properties}">
-            <entry key="${basedir}" value=""/>
-        </propertyfile>
-    </target>
-    <target depends="init" name="-do-clean">
-        <delete dir="${build.dir}"/>
-        <delete dir="${dist.dir}" followsymlinks="false" includeemptydirs="true"/>
-    </target>
-    <target name="-post-clean">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="init,deps-clean,-do-clean,-post-clean" description="Clean build products." name="clean"/>
-    <target name="-check-call-dep">
-        <property file="${call.built.properties}" prefix="already.built."/>
-        <condition property="should.call.dep">
-            <not>
-                <isset property="already.built.${call.subproject}"/>
-            </not>
-        </condition>
-    </target>
-    <target depends="-check-call-dep" if="should.call.dep" name="-maybe-call-dep">
-        <ant antfile="${call.script}" inheritall="false" target="${call.target}">
-            <propertyset>
-                <propertyref prefix="transfer."/>
-                <mapper from="transfer.*" to="*" type="glob"/>
-            </propertyset>
-        </ant>
-    </target>
-</project>
diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties
deleted file mode 100644
index 47f9678..0000000
--- a/nbproject/genfiles.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-build.xml.data.CRC32=cba644ff
-build.xml.script.CRC32=74386eec
-build.xml.stylesheet.CRC32=ba5d3624
-# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
-# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=94bef83f
-nbproject/build-impl.xml.script.CRC32=c8383d25
-nbproject/build-impl.xml.stylesheet.CRC32=0c01fd8e@1.43.1.45
diff --git a/nbproject/private/cache/.refactorit/cache.bin b/nbproject/private/cache/.refactorit/cache.bin
deleted file mode 100644
index 9b53429..0000000
Binary files a/nbproject/private/cache/.refactorit/cache.bin and /dev/null differ
diff --git a/nbproject/private/config.properties b/nbproject/private/config.properties
deleted file mode 100644
index e69de29..0000000
diff --git a/nbproject/private/private.properties b/nbproject/private/private.properties
deleted file mode 100644
index fbceaf3..0000000
--- a/nbproject/private/private.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-application.args=
-compile.on.save=false
-do.depend=false
-do.jar=true
-javac.debug=true
-javadoc.preview=true
-user.properties.file=C:\\Users\\akshath\\.netbeans\\7.0\\build.properties
-default.javac.source=1.3
-default.javac.target=1.3
diff --git a/nbproject/private/private.xml b/nbproject/private/private.xml
deleted file mode 100644
index c1f155a..0000000
--- a/nbproject/private/private.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project-private xmlns="http://www.netbeans.org/ns/project-private/1">
-    <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/1"/>
-</project-private>
diff --git a/nbproject/project.properties b/nbproject/project.properties
deleted file mode 100644
index 4282d60..0000000
--- a/nbproject/project.properties
+++ /dev/null
@@ -1,85 +0,0 @@
-annotation.processing.enabled=true
-annotation.processing.enabled.in.editor=false
-annotation.processing.run.all.processors=true
-annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
-application.args=
-application.title=SocketTest
-application.vendor=Akshathkumar Shetty
-build.classes.dir=${build.dir}/classes
-build.classes.excludes=**/*.java,**/*.form
-# This directory is removed when the project is cleaned:
-build.dir=build
-build.generated.dir=${build.dir}/generated
-build.generated.sources.dir=${build.dir}/generated-sources
-# Only compile against the classpath explicitly listed here:
-build.sysclasspath=ignore
-build.test.classes.dir=${build.dir}/test/classes
-build.test.results.dir=${build.dir}/test/results
-debug.classpath=\
-    ${run.classpath}
-debug.test.classpath=\
-    ${run.test.classpath}
-# This directory is removed when the project is cleaned:
-dist.dir=dist
-dist.jar=${dist.dir}/SocketTest.jar
-dist.javadoc.dir=${dist.dir}/javadoc
-endorsed.classpath=
-excludes=
-file.reference.metouia.jar=lib/metouia.jar
-file.reference.swt.jar=lib/swt.jar
-includes=**
-jar.archive.disabled=${jnlp.enabled}
-jar.compress=false
-jar.index=${jnlp.enabled}
-javac.classpath=\
-    ${file.reference.swt.jar}:\
-    ${file.reference.metouia.jar}
-# Space-separated list of extra javac options
-javac.compilerargs=
-javac.deprecation=false
-javac.processorpath=\
-    ${javac.classpath}
-javac.source=1.3
-javac.target=1.1
-javac.test.classpath=\
-    ${javac.classpath}:\
-    ${build.classes.dir}:\
-    ${libs.junit.classpath}
-javac.test.processorpath=${javac.test.classpath}
-javadoc.additionalparam=
-javadoc.author=false
-javadoc.encoding=
-javadoc.noindex=false
-javadoc.nonavbar=false
-javadoc.notree=false
-javadoc.private=false
-javadoc.splitindex=true
-javadoc.use=true
-javadoc.version=false
-javadoc.windowtitle=
-jnlp.codebase.type=no.codebase
-jnlp.descriptor=application
-jnlp.enabled=false
-jnlp.mixed.code=default
-jnlp.offline-allowed=false
-jnlp.signed=false
-jnlp.signing=
-jnlp.signing.alias=
-jnlp.signing.keystore=
-main.class=net.sf.sockettest.SocketTest
-manifest.file=manifest.mf
-meta.inf.dir=${src.dir}/META-INF
-mkdist.disabled=false
-platform.active=default_platform
-run.classpath=\
-    ${javac.classpath}:\
-    ${build.classes.dir}
-# Space-separated list of JVM arguments used when running the project
-# (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value
-# or test-sys-prop.name=value to set system properties for unit tests):
-run.jvmargs=
-run.test.classpath=\
-    ${javac.test.classpath}:\
-    ${build.test.classes.dir}
-src.dir=src
-test.src.dir=test
diff --git a/nbproject/project.xml b/nbproject/project.xml
deleted file mode 100644
index d79e72f..0000000
--- a/nbproject/project.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://www.netbeans.org/ns/project/1">
-    <type>org.netbeans.modules.java.j2seproject</type>
-    <configuration>
-        <data xmlns="http://www.netbeans.org/ns/j2se-project/3">
-            <name>SocketTest</name>
-            <source-roots>
-                <root id="src.dir"/>
-            </source-roots>
-            <test-roots>
-                <root id="test.src.dir"/>
-            </test-roots>
-        </data>
-    </configuration>
-</project>
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000..a22a0b1
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,49 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>net.sf.sockettest</groupId>
+    <artifactId>SocketTest</artifactId>
+    <version>3.0-SNAPSHOT</version>
+    <packaging>jar</packaging>
+
+    <name>SocketTest</name>
+    <url>http://maven.apache.org</url>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+    <dependencies>
+        <!-- mvn install:install-file -Dfile=dist/metouia.jar -DgroupId=net.sf.metouia -DartifactId=metouia -Dversion=1.0.0 -Dpackaging=jar -->
+        <dependency>
+            <groupId>net.sf.metouia</groupId>
+            <artifactId>metouia</artifactId>
+            <version>1.0.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>3.4</version>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.11</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.5.1</version>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/src/net/sf/sockettest/MyTrustManager.java b/src/main/java/net/sf/sockettest/MyTrustManager.java
similarity index 87%
rename from src/net/sf/sockettest/MyTrustManager.java
rename to src/main/java/net/sf/sockettest/MyTrustManager.java
index d6446eb..5f98519 100644
--- a/src/net/sf/sockettest/MyTrustManager.java
+++ b/src/main/java/net/sf/sockettest/MyTrustManager.java
@@ -1,8 +1,9 @@
 package net.sf.sockettest;
 
+import net.sf.sockettest.swing.AskView;
+
 import javax.net.ssl.*;
 import java.security.cert.*;
-import java.awt.*;
 import javax.swing.*;
 import java.security.*;
 
@@ -13,13 +14,13 @@
  */
 public class MyTrustManager implements X509TrustManager {
 
-	private Component parentComponent;
+	private AskView view;
 	private X509TrustManager sunJSSEX509TrustManager;
 
 
 
-	public MyTrustManager(Component parentComponent) throws Exception {
-		this.parentComponent = parentComponent;
+	public MyTrustManager(AskView view) throws Exception {
+		this.view = view;
 
 		TrustManagerFactory tmf = TrustManagerFactory.getInstance("SunX509", "SunJSSE");
 		
@@ -84,13 +85,9 @@ public void checkServerTrusted(X509Certificate[] chain, String authType)
 				 } else {
 					 sb.append("\n Issued By:\n \t"+chain[i].getSubjectDN());
 				 }
-			 }
-
-			 int option = JOptionPane.showConfirmDialog(parentComponent,
-				sb.toString(), "Certificate Confirmation",
-				JOptionPane.YES_NO_OPTION, JOptionPane.INFORMATION_MESSAGE);
+			 };
 
-			 if(option==JOptionPane.NO_OPTION) {
+			 if(view.confirm("Certificate Confirmation", sb.toString(), JOptionPane.NO_OPTION)) {
 				 throw new CertificateException("Not Trusted Certificate!");
 			 }
 		}
diff --git a/src/net/sf/sockettest/PortModel.java b/src/main/java/net/sf/sockettest/PortModel.java
similarity index 100%
rename from src/net/sf/sockettest/PortModel.java
rename to src/main/java/net/sf/sockettest/PortModel.java
diff --git a/src/net/sf/sockettest/SocketClient.java b/src/main/java/net/sf/sockettest/SocketClient.java
similarity index 56%
rename from src/net/sf/sockettest/SocketClient.java
rename to src/main/java/net/sf/sockettest/SocketClient.java
index c07ea59..fb12534 100644
--- a/src/net/sf/sockettest/SocketClient.java
+++ b/src/main/java/net/sf/sockettest/SocketClient.java
@@ -2,7 +2,13 @@
 
 import java.net.*;
 import java.io.*;
-import net.sf.sockettest.swing.SocketTestClient;
+
+import net.sf.sockettest.controller.SocketTestClientController;
+import net.sf.sockettest.swing.SocketTestClientView;
+import org.apache.commons.lang3.StringEscapeUtils;
+
+import javax.xml.bind.DatatypeConverter;
+
 /**
  *
  * @author Akshathkumar Shetty
@@ -10,36 +16,38 @@
 public class SocketClient extends Thread {
     
     private static SocketClient socketClient=null;
+    private SocketTestClientController controller;
     private Socket socket=null;
-    private SocketTestClient parent;
+    private SocketTestClientView view;
     private BufferedInputStream in;
-    private boolean desonnected=false;
+    private boolean disconnected =false;
     
-    public synchronized void setDesonnected(boolean cr) {
-        desonnected=cr;
+    public synchronized void setDisconnected(boolean cr) {
+        disconnected =cr;
     }
     
-    private SocketClient(SocketTestClient parent, Socket s) {
+    private SocketClient(SocketTestClientView view, SocketTestClientController controller, Socket s) {
         super("SocketClient");
-        this.parent = parent;
+        this.view = view;
+        this.controller = controller;
         socket=s;
-        setDesonnected(false);
+        setDisconnected(false);
         start();
     }
     
-    public static synchronized SocketClient handle(SocketTestClient parent, Socket s) {
+    public static synchronized SocketClient handle(SocketTestClientView view, SocketTestClientController controller, Socket s) {
         if(socketClient==null)
-            socketClient=new SocketClient(parent, s);
+            socketClient=new SocketClient(view, controller, s);
         else {
             if(socketClient.socket!=null) {
                 try	{
                     socketClient.socket.close();
                 } catch (Exception e)	{
-                    parent.error(e.getMessage());
+                    view.error(e.getMessage());
                 }
             }
             socketClient.socket=null;
-            socketClient=new SocketClient(parent,s);
+            socketClient=new SocketClient(view, controller, s);
         }
         return socketClient;
     }
@@ -55,38 +63,36 @@ public void run() {
             } catch(IOException e2) {
                 System.err.println("Socket not closed :"+e2);
             }
-            parent.error("Could not open socket : "+e.getMessage());
-            parent.disconnect();
+            view.error("Could not open socket : "+e.getMessage());
+            controller.disconnect();
             return;
         }
         
-        while(!desonnected) {
+        while(!disconnected) {
             try {
-                String got = readInputStream(in); //in.readLine();
+                String got = readInputStream(in);
                 if(got==null) {
-                    //parent.error("Connection closed by client");
-                    parent.disconnect();
+                    controller.disconnect();
                     break;
                 }
-                //got = got.replaceAll("\n","<LF>");
-                //got = got.replaceAll("\r","<CR>");
-                //parent.append("R: "+got);
-                parent.appendnoNewLine(got);
+                if(view.isHexOutput()) {
+                    got = DatatypeConverter.printHexBinary(got.getBytes());
+                }
+                view.appendMessage(got);
             } catch(IOException e) {
-                if(!desonnected) {
-                    parent.error(e.getMessage(),"Connection lost");
-                    parent.disconnect();
+                if(!disconnected) {
+                    view.error(e.getMessage(),"Connection lost");
+                    controller.disconnect();
                 }
                 break;
             }
-        }//end of while
+        }
         try	{
             is.close();
             in.close();
-            //socket.close();
         } catch (Exception err) {}
         socket=null;
-    }//end of run
+    }
     
     private static String readInputStream(BufferedInputStream _in) throws IOException {
         String data = "";
@@ -101,7 +107,6 @@ private static String readInputStream(BufferedInputStream _in) throws IOExceptio
             _in.read(byteData);
             data += new String(byteData);
         }
-        return data;
+        return StringEscapeUtils.unescapeJava(data);
     }
-    
 }
diff --git a/src/net/sf/sockettest/SocketServer.java b/src/main/java/net/sf/sockettest/SocketServer.java
similarity index 58%
rename from src/net/sf/sockettest/SocketServer.java
rename to src/main/java/net/sf/sockettest/SocketServer.java
index 3c436ba..5ac238c 100644
--- a/src/net/sf/sockettest/SocketServer.java
+++ b/src/main/java/net/sf/sockettest/SocketServer.java
@@ -3,6 +3,10 @@
 import java.net.*;
 import java.io.*;
 import net.sf.sockettest.swing.SocketTestServer;
+import net.sf.sockettest.swing.SocketTestServerView;
+import org.apache.commons.lang3.StringEscapeUtils;
+
+import javax.xml.bind.DatatypeConverter;
 
 /**
  *
@@ -12,28 +16,28 @@ public class SocketServer extends Thread {
     
     private static SocketServer socketServer = null;
     private Socket socket = null;
+    private final SocketTestServerView view;
+    private final SocketTextServerController controller;
     private ServerSocket server = null;
-    private SocketTestServer parent;
     private BufferedInputStream in;
     private boolean desonnected=false;
     private boolean stop = false;
-    
-    //disconnect client
-    public synchronized void setDesonnected(boolean cr) {
-        if(socket!=null && cr==true) {
+
+    public synchronized void setDesconnected(boolean cr) {
+        if(socket!=null && cr) {
             try	{
                 socket.close();
             } catch (Exception e) {
-                System.err.println("Error closing clinet : setDesonnected : "+e);
+                System.err.println("Error closing clinet : setDesconnected : "+e);
             }
         }
         desonnected=cr;
         //parent.setClientSocket(null);
     }
-    //stop server
+
     public synchronized void setStop(boolean cr) {
         stop=cr;
-        if(server!=null && cr==true) {
+        if(server!=null && cr) {
             try	{
                 server.close();
             } catch (Exception e) {
@@ -42,37 +46,38 @@ public synchronized void setStop(boolean cr) {
         }
     }
     
-    private SocketServer(SocketTestServer parent, ServerSocket s) {
+    private SocketServer(SocketTestServerView view, SocketTextServerController controller, ServerSocket s) {
         super("SocketServer");
-        this.parent = parent;
+        this.view = view;
+        this.controller = controller;
         server=s;
         setStop(false);
-        setDesonnected(false);
+        setDesconnected(false);
         start();
     }
     
     
     
-    public static synchronized SocketServer handle(SocketTestServer parent,
+    public static synchronized SocketServer handle(SocketTestServerView view, SocketTextServerController controller,
             ServerSocket s) {
         if(socketServer==null)
-            socketServer=new SocketServer(parent, s);
+            socketServer=new SocketServer(view, controller, s);
         else {
             if(socketServer.server!=null) {
                 try	{
-                    socketServer.setDesonnected(true);
+                    socketServer.setDesconnected(true);
                     socketServer.setStop(true);
                     if(socketServer.socket!=null)
                         socketServer.socket.close();
                     if(socketServer.server!=null)
                         socketServer.server.close();
                 } catch (Exception e)	{
-                    parent.error(e.getMessage());
+                    view.error(e.getMessage());
                 }
             }
             socketServer.server = null;
             socketServer.socket = null;
-            socketServer=new SocketServer(parent,s);
+            socketServer=new SocketServer(view, controller, s);
         }
         return socketServer;
     }
@@ -83,7 +88,7 @@ public void run() {
                 socket = server.accept();
             } catch (Exception e) {
                 if(!stop) {
-                    parent.error(e.getMessage(),"Error acception connection");
+                    view.error(e.getMessage(),"Error acception connection");
                     stop=true;
                 }
                 continue;
@@ -96,66 +101,66 @@ public void run() {
                     System.err.println("Erro closing client socket : "+e);
                 }
                 socket=null;
-                parent.setClientSocket(socket);
+                controller.setClientSocket(socket);
             }
-        }//end of while
-    }//end of run
+        }
+    }
     
     private void startServer() {
-        parent.setClientSocket(socket);
+        controller.setClientSocket(socket);
         InputStream is = null;
-        parent.append("> New Client: "+socket.getInetAddress().getHostAddress());
+        view.appendMessage("> New Client: "+socket.getInetAddress().getHostAddress());
         try {
             is = socket.getInputStream();
             in = new BufferedInputStream(is);
         } catch(IOException e) {
-            parent.append("> Cound't open input stream on Clinet "+e.getMessage());
-            setDesonnected(true);
+            view.appendMessage("> Cound't open input stream on Clinet "+e.getMessage());
+            setDesconnected(true);
             return;
         }
         
-        String rec=null;
+        String rec;
         while(true) {
-            rec=null;
-            try	{
-                rec = readInputStream(in);//in.readLine();
+            try {
+                rec = readInputStream(in);
             } catch (Exception e) {
-                setDesonnected(true);
+                setDesconnected(true);
                 if(!desonnected) {
-                    parent.error(e.getMessage(),"Lost Client conection");
-                    parent.append("> Server lost Client conection.");
+                    view.error(e.getMessage(),"Lost Client conection");
+                    view.appendMessage("> Server lost Client conection.");
                 } else
-                    parent.append("> Server closed Client conection.");
+                    view.appendMessage("> Server closed Client conection.");
                 break;
             }
             
             if (rec != null) {
-                //rec = rec.replaceAll("\n","<LF>");
-                //rec = rec.replaceAll("\r","<CR>");
-                //parent.append("R: "+rec);
-                parent.appendnoNewLine(rec);
+                if(view.isHexOutput()) {
+                    rec = DatatypeConverter.printHexBinary(rec.getBytes());
+                }
+                view.appendMessage(rec);
             } else {
-                setDesonnected(true);
-                parent.append("> Client closed conection.");
+                setDesconnected(true);
+                view.appendMessage("> Client closed conection.");
                 break;
             }
-        } //end of while
-    } //end of startServer
+        }
+    }
     
-    private static String readInputStream(BufferedInputStream _in)
+    private static String readInputStream(BufferedInputStream in)
     throws IOException {
         String data = "";
-        int s = _in.read();
-        if(s==-1)
+        int s = in.read();
+        if(s == -1) {
             return null;
+        }
         data += ""+(char)s;
-        int len = _in.available();
+        int len = in.available();
         System.out.println("Len got : "+len);
         if(len > 0) {
             byte[] byteData = new byte[len];
-            _in.read(byteData);
+            in.read(byteData);
             data += new String(byteData);
         }
-        return data;
+        return StringEscapeUtils.unescapeJava(data);
     }
 }
diff --git a/src/net/sf/sockettest/SocketTest.java b/src/main/java/net/sf/sockettest/SocketTest.java
similarity index 82%
rename from src/net/sf/sockettest/SocketTest.java
rename to src/main/java/net/sf/sockettest/SocketTest.java
index d0ad4d8..48e3837 100644
--- a/src/net/sf/sockettest/SocketTest.java
+++ b/src/main/java/net/sf/sockettest/SocketTest.java
@@ -1,11 +1,9 @@
 package net.sf.sockettest;
 
 import java.awt.*;
-import java.applet.*;
-import java.awt.event.*;
 import javax.swing.*;
-import javax.swing.event.*;
-import javax.swing.border.*;
+
+import net.sf.sockettest.controller.SocketTestClientController;
 import net.sf.sockettest.swing.About;
 import net.sf.sockettest.swing.SocketTestClient;
 import net.sf.sockettest.swing.SocketTestServer;
@@ -27,14 +25,16 @@ public class SocketTest extends JFrame {
     /** Creates a new instance of SocketTest */
     public SocketTest() {
         Container cp = getContentPane();
-        
+
         tabbedPane = new JTabbedPane(JTabbedPane.TOP);
-        SocketTestClient client = new SocketTestClient(this);
-        SocketTestServer server = new SocketTestServer(this);
-        SocketTestUdp udp = new SocketTestUdp(this);
+        SocketTestClient client = new SocketTestClient().setParent(this);
+        client.setController(new SocketTestClientController());
+        SocketTestServer server = new SocketTestServer().setParent(this);
+        server.setController(new SocketTextServerController());
+        SocketTestUdp udp = new SocketTestUdp().setParent(this);
         About about = new About();
         
-        tabbedPane.addTab("Client", ball, (Component)client, "Test any server");
+        tabbedPane.addTab("Client", ball, client, "Test any server");
         tabbedPane.addTab("Server", ball, server, "Test any client");
         tabbedPane.addTab("Udp", ball, udp, "Test any UDP Client or Server");
         tabbedPane.addTab("About", ball, about, "About SocketTest");
@@ -50,7 +50,6 @@ public static void main(String[] args) {
         try {
             UIManager.setLookAndFeel("net.sourceforge.mlf.metouia.MetouiaLookAndFeel");
         } catch(Exception e) {
-            //e.printStackTrace();
             try {
                 UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
             } catch(Exception ee) {
diff --git a/src/main/java/net/sf/sockettest/SocketTextServerController.java b/src/main/java/net/sf/sockettest/SocketTextServerController.java
new file mode 100644
index 0000000..70a3078
--- /dev/null
+++ b/src/main/java/net/sf/sockettest/SocketTextServerController.java
@@ -0,0 +1,174 @@
+package net.sf.sockettest;
+
+import net.sf.sockettest.swing.SocketTestServerView;
+import org.apache.commons.lang3.StringEscapeUtils;
+
+import javax.swing.*;
+import javax.xml.bind.DatatypeConverter;
+import java.io.BufferedWriter;
+import java.io.OutputStreamWriter;
+import java.io.PrintWriter;
+import java.net.InetAddress;
+import java.net.ServerSocket;
+import java.net.Socket;
+
+public class SocketTextServerController {
+    private Socket socket;
+    private ServerSocket server;
+    private SocketServer socketServer;
+    private PrintWriter out;
+
+    private SocketTestServerView view;
+
+    public void setView(SocketTestServerView view) {
+        this.view = view;
+    }
+
+    public void connect(String ip, String port) {
+        if(server!=null) {
+            stop();
+            return;
+        }
+        if(ip ==null || ip.equals("")) {
+            view.error("No IP Address. Please enter IP Address",
+                    "Error connecting");
+            view.focusOnIp();
+            return;
+        }
+        if(port ==null || port.equals("")) {
+            view.error("No Port number. Please enter Port number",
+                    "Error connecting");
+            view.focusOnPort();
+            return;
+        }
+        view.startWaitInfo();
+        if(!Util.checkHost(ip)) {
+            view.error("Bad IP Address",
+                    "Error connecting");
+            view.focusOnIp();
+            view.stopWaitInfo();
+            return;
+        }
+        int portNo;
+        try	{
+            portNo=Integer.parseInt(port);
+        } catch (Exception e) {
+            view.error("Bad Port number. Please enter Port number",
+                    "Error connecting");
+            view.focusOnPort();
+            view.stopWaitInfo();
+            return;
+        }
+        try {
+            InetAddress bindAddr;
+            if(!ip.equals("0.0.0.0"))
+                bindAddr = InetAddress.getByName(ip);
+            else
+                bindAddr = null;
+            server = new ServerSocket(portNo,1,bindAddr);
+
+            view.connected();
+        } catch (Exception e) {
+            view.error(e.getMessage(), "Starting Server at "+portNo);
+            view.stopWaitInfo();
+            return;
+        }
+        view.stopWaitInfo();
+        view.appendMessage("> Server Started on Port: "+portNo);
+        view.appendMessage("> ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~");
+        socketServer = SocketServer.handle(view, this, server);
+    }
+
+    public void sendMessage(String s) {
+        view.startWaitInfo();
+        try	{
+            if(out==null) {
+                out = new PrintWriter(new BufferedWriter(
+                        new OutputStreamWriter(socket.getOutputStream())), true);
+            }
+            if (view.isHexOutput()) {
+                view.appendMessage("S: " + DatatypeConverter.printHexBinary(s.getBytes()));
+            } else {
+                view.appendMessage("S: " + s);
+            }
+            out.print(StringEscapeUtils.escapeJava(s));
+            out.flush();
+            view.resetSendField();
+            view.stopWaitInfo();
+        } catch (Exception e) {
+            view.stopWaitInfo();
+            view.error(e.getMessage(),"Error Sending Message");
+            disconnect();
+        }
+    }
+
+    public void buildMessage(String text) {
+        String msg;
+        if (view.isHexInput()) {
+            try {
+                msg = new String(DatatypeConverter.parseHexBinary(text));
+            } catch (Exception ex) {
+                view.error(ex.getMessage());
+                return;
+            }
+        } else {
+            msg = StringEscapeUtils.unescapeJava(text);
+        }
+
+        if(!msg.equals(""))
+            sendMessage(msg);
+        else {
+            if (view.confirm("Send Data To Client", "Send Blank Line ?", JOptionPane.YES_OPTION)) {
+                sendMessage(msg);
+            }
+        }
+    }
+
+    public void saveFile(String text) {
+        if (text.equals("")) {
+            view.error("Nothing to save", "Save to file");
+            return;
+        }
+        String fileName = view.chooseFile();
+        if (fileName != null) {
+            try {
+                Util.writeFile(fileName, text);
+            } catch (Exception ioe) {
+                view.error("" + ioe.getMessage(),
+                        "Error saving to file..");
+            }
+        }
+    }
+
+    public synchronized void disconnect() {
+        try {
+            socketServer.setDesconnected(true);
+        } catch (Exception e) {}
+    }
+
+    public synchronized void stop() {
+        try {
+            disconnect(); //close any client
+            socketServer.setStop(true);
+        } catch (Exception e) {}
+        server=null;
+        view.stopped();
+        view.appendMessage("> Server stopped");
+        view.appendMessage("> ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~");
+    }
+
+    public synchronized void setClientSocket(Socket s) {
+
+        if(s==null) {
+            out=null;
+            socket = null;
+            view.showConnectionInfo("NONE");
+            view.socketSet(false);
+        } else {
+            socket = s;
+            view.showConnectionInfo(" "+socket.getInetAddress().getHostName()+
+                    " ["+socket.getInetAddress().getHostAddress()+"] ");
+            view.socketSet(true);
+        }
+    }
+}
diff --git a/src/net/sf/sockettest/UdpServer.java b/src/main/java/net/sf/sockettest/UdpServer.java
similarity index 99%
rename from src/net/sf/sockettest/UdpServer.java
rename to src/main/java/net/sf/sockettest/UdpServer.java
index 980b22b..b7f5d4b 100644
--- a/src/net/sf/sockettest/UdpServer.java
+++ b/src/main/java/net/sf/sockettest/UdpServer.java
@@ -1,7 +1,7 @@
 package net.sf.sockettest;
 
 import java.net.*;
-import java.io.*;
+
 import net.sf.sockettest.swing.SocketTestUdp;
 /**
  *
diff --git a/src/net/sf/sockettest/Util.java b/src/main/java/net/sf/sockettest/Util.java
similarity index 100%
rename from src/net/sf/sockettest/Util.java
rename to src/main/java/net/sf/sockettest/Util.java
diff --git a/src/main/java/net/sf/sockettest/controller/SocketTestClientController.java b/src/main/java/net/sf/sockettest/controller/SocketTestClientController.java
new file mode 100644
index 0000000..716977c
--- /dev/null
+++ b/src/main/java/net/sf/sockettest/controller/SocketTestClientController.java
@@ -0,0 +1,176 @@
+package net.sf.sockettest.controller;
+
+import net.sf.sockettest.MyTrustManager;
+import net.sf.sockettest.SocketClient;
+import net.sf.sockettest.Util;
+import net.sf.sockettest.swing.SocketTestClientView;
+import org.apache.commons.lang3.StringEscapeUtils;
+
+import javax.net.ssl.KeyManager;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLSocketFactory;
+import javax.net.ssl.TrustManager;
+import javax.swing.*;
+import javax.xml.bind.DatatypeConverter;
+import java.io.BufferedWriter;
+import java.io.OutputStreamWriter;
+import java.io.PrintWriter;
+import java.net.Socket;
+import java.security.SecureRandom;
+
+import static sun.management.Agent.error;
+
+public class SocketTestClientController {
+    private boolean secure;
+    private Socket socket;
+    private PrintWriter out;
+    private SocketClient socketClient;
+    private SocketTestClientView view;
+
+    public SocketTestClientController() {
+        secure = false;
+    }
+
+    public void setView(SocketTestClientView view) {
+        this.view = view;
+    }
+
+    public void toggleSecure() {
+        secure = !secure;
+    }
+
+    public void connect(String ip, String port) {
+        if(socket!=null) {
+            disconnect();
+            return;
+        }
+        if(ip ==null || ip.equals("")) {
+            error("No IP Address. Please enter IP Address",
+                    "Error connecting");
+            view.focusOnIp();
+            return;
+        }
+        if(port ==null || port.equals("")) {
+            error("No Port number. Please enter Port number",
+                    "Error connecting");
+            view.focusOnPort();
+            return;
+        }
+        view.startWaitInfo();
+        if(!Util.checkHost(ip)) {
+            error("Bad IP Address",
+                    "Error connecting");
+            view.focusOnIp();
+            view.stopWaitInfo();
+            return;
+        }
+        int portNo;
+        try {
+            portNo=Integer.parseInt(port);
+        } catch (Exception e) {
+            error("Bad Port number. Please enter Port number",
+                    "Error connecting");
+            view.focusOnPort();
+            view.stopWaitInfo();
+            return;
+        }
+        try {
+            if(!secure) {
+                System.out.println("Connecting in normal mode : "+ ip +":"+portNo);
+                socket = new Socket(ip,portNo);
+            } else {
+                System.out.println("Connecting in secure mode : "+ ip +":"+portNo);
+                //SocketFactory factory = SSLSocketFactory.getDefault();
+
+                TrustManager[] tm = new TrustManager[] { new MyTrustManager(view) };
+
+                SSLContext context = SSLContext.getInstance("TLS");
+                context.init(new KeyManager[0], tm, new SecureRandom());
+
+                SSLSocketFactory factory = context.getSocketFactory();
+                socket = factory.createSocket(ip,portNo);
+            }
+
+            view.connected();
+        } catch (Exception e) {
+            e.printStackTrace();
+            error(e.getMessage(), "Opening connection");
+            view.stopWaitInfo();
+            return;
+        }
+        view.showConectionInfo(" "+socket.getInetAddress().getHostName()+
+                " ["+socket.getInetAddress().getHostAddress()+"] ");
+        view.stopWaitInfo();
+        view.clearMessages();
+        socketClient = SocketClient.handle(view, this, socket);
+        view.focusSendField();
+    }
+
+    public synchronized void disconnect() {
+        try {
+            socketClient.setDisconnected(true);
+            socket.close();
+        } catch (Exception e) {
+            System.err.println("Error closing client : "+e);
+        }
+        socket=null;
+        out=null;
+        view.disconnected();
+    }
+
+    public void buildMessage(String text, boolean hexInput) {
+        String msg;
+        if (hexInput) {
+            try {
+                msg = new String(DatatypeConverter.parseHexBinary(text));
+            } catch (Exception ex) {
+                error(ex.getMessage());
+                return;
+            }
+        } else {
+            msg = StringEscapeUtils.unescapeJava(text);
+        }
+        if(!msg.equals(""))
+            sendMessage(msg);
+        else {
+            if (view.confirm("Send Data To Server", "Send Blank Line ?", JOptionPane.YES_OPTION)) {
+                sendMessage(msg);
+            }
+        }
+    }
+
+    public void sendMessage(String s) {
+        view.startWaitInfo();
+        try {
+            if(out==null) {
+                out = new PrintWriter(new BufferedWriter(
+                        new OutputStreamWriter(socket.getOutputStream())), true);
+            }
+            if (view.isHexOutput()) {
+                view.appendMessage("S: " + DatatypeConverter.printHexBinary(s.getBytes()));
+            } else {
+                view.appendMessage("S: "+s);
+            }
+            out.print(StringEscapeUtils.escapeJava(s));
+            out.flush();
+            view.resetSend();
+            view.stopWaitInfo();
+        } catch (Exception e) {
+            view.stopWaitInfo();
+            error(e.getMessage(),"Error Sending Message");
+            disconnect();
+        }
+    }
+
+    public void saveMessages() {
+        String text = view.getMessages();
+        if(text.equals("")) {
+            error("Nothing to save","Save to file");
+            return;
+        }
+        String fileName = view.chooseFile();
+        if (fileName != null) {
+            view.saveText(text, fileName);
+        }
+    }
+}
diff --git a/src/net/sf/sockettest/swing/About.java b/src/main/java/net/sf/sockettest/swing/About.java
similarity index 96%
rename from src/net/sf/sockettest/swing/About.java
rename to src/main/java/net/sf/sockettest/swing/About.java
index 2b107cb..0e37b36 100644
--- a/src/net/sf/sockettest/swing/About.java
+++ b/src/main/java/net/sf/sockettest/swing/About.java
@@ -1,10 +1,7 @@
 package net.sf.sockettest.swing;
 
 import java.awt.*;
-import java.awt.event.*;
 import javax.swing.*;
-import javax.swing.event.*;
-import javax.swing.border.*;
 import java.io.IOException;
 import net.sf.sockettest.*;
 
@@ -12,7 +9,7 @@
  * About Tab
  * @author Akshathkumar Shetty
  */
-public class About extends JPanel /*JFrame*/ {
+public class About extends JPanel {
     private ClassLoader cl = getClass().getClassLoader();
     public ImageIcon logo = new ImageIcon(
             cl.getResource("icons/logo.gif"));
@@ -139,7 +136,7 @@ public About() {
         centerPanel = new JPanel();
         readme.setText("Loading... readme");
         try {
-            String cont = Util.readFile("readme.txt",(Object)About.this);
+            String cont = Util.readFile("readme.txt", About.this);
             readme.setText(cont);
         } catch (IOException e){
             System.err.println("Error reading readme.txt "+e);
diff --git a/src/main/java/net/sf/sockettest/swing/AskView.java b/src/main/java/net/sf/sockettest/swing/AskView.java
new file mode 100644
index 0000000..ec98513
--- /dev/null
+++ b/src/main/java/net/sf/sockettest/swing/AskView.java
@@ -0,0 +1,9 @@
+package net.sf.sockettest.swing;
+
+public interface AskView {
+    boolean confirm(String title, String message, int option);
+
+    void error(String error);
+
+    void error(String error, String heading);
+}
diff --git a/src/net/sf/sockettest/swing/PortDialog.java b/src/main/java/net/sf/sockettest/swing/PortDialog.java
similarity index 94%
rename from src/net/sf/sockettest/swing/PortDialog.java
rename to src/main/java/net/sf/sockettest/swing/PortDialog.java
index e34eb84..69319ec 100644
--- a/src/net/sf/sockettest/swing/PortDialog.java
+++ b/src/main/java/net/sf/sockettest/swing/PortDialog.java
@@ -1,9 +1,8 @@
 package net.sf.sockettest.swing;
 
 import javax.swing.*;
-import javax.swing.table.*;
 import java.awt.*;
-import java.io.IOException;
+
 import net.sf.sockettest.PortModel;
 import net.sf.sockettest.*;
 
diff --git a/src/net/sf/sockettest/swing/SocketTestClient.java b/src/main/java/net/sf/sockettest/swing/SocketTestClient.java
similarity index 51%
rename from src/net/sf/sockettest/swing/SocketTestClient.java
rename to src/main/java/net/sf/sockettest/swing/SocketTestClient.java
index d656398..f9a03f7 100644
--- a/src/net/sf/sockettest/swing/SocketTestClient.java
+++ b/src/main/java/net/sf/sockettest/swing/SocketTestClient.java
@@ -3,28 +3,22 @@
 import java.awt.*;
 import java.awt.event.*;
 import javax.swing.*;
-import javax.swing.event.*;
 import javax.swing.border.*;
 
-import java.security.SecureRandom;
-
-import java.net.*;
 import java.io.*;
 
-import javax.net.*;
-import javax.net.ssl.*;
-
 import net.sf.sockettest.*;
+import net.sf.sockettest.controller.SocketTestClientController;
+
 /**
  *
  * @author Akshathkumar Shetty
  */
-public class SocketTestClient extends JPanel {
+public class SocketTestClient extends JPanel implements SocketTestClientView {
     
     private final String NEW_LINE = "\r\n";
     private ClassLoader cl = getClass().getClassLoader();
-    public ImageIcon logo = new ImageIcon(
-            cl.getResource("icons/logo.gif"));
+    public ImageIcon logo = new ImageIcon(cl.getResource("icons/logo.gif"));
     
     private JPanel topPanel;
     private JPanel toPanel;
@@ -44,7 +38,7 @@ public class SocketTestClient extends JPanel {
     private JButton connectButton = new JButton("Connect");
     
     private JLabel convLabel = new JLabel("Conversation with host");
-    private Border connectedBorder = BorderFactory.createTitledBorder(new EtchedBorder(),"Connected To < NONE >");
+    private Border connectedBorder;
     private JTextArea messagesField = new JTextArea();
     
     private JLabel sendLabel = new JLabel("Message");
@@ -55,19 +49,25 @@ public class SocketTestClient extends JPanel {
     private JButton clearButton = new JButton("Clear");
     
     private JCheckBox secureButton = new JCheckBox("Secure");
-    private boolean isSecure = false;
+    private JCheckBox hexInputCheckBox = new JCheckBox("Hex Input");
+    private JCheckBox hexOutputCheckBox = new JCheckBox("Hex Output");
     private GridBagConstraints gbc = new GridBagConstraints();
-    
-    private Socket socket;
-    private PrintWriter out;
-    private SocketClient socketClient;
-    protected final JFrame parent;
-    
-    public SocketTestClient(final JFrame parent) {
-        //Container cp = getContentPane();
-        this.parent = parent;
+    private JFrame parent;
+    private SocketTestClientController controller;
+
+    public SocketTestClient() {
+        buildGUI();
+        showConectionInfo("NONE");
+    }
+
+    public void setController(SocketTestClientController controller) {
+        this.controller = controller;
+        controller.setView(this);
+    }
+
+    private void buildGUI() {
         Container cp = this;
-        
+
         topPanel = new JPanel();
         toPanel = new JPanel();
         toPanel.setLayout(new GridBagLayout());
@@ -81,39 +81,38 @@ public SocketTestClient(final JFrame parent) {
         gbc.anchor = GridBagConstraints.EAST;
         gbc.fill = GridBagConstraints.NONE;
         toPanel.add(ipLabel, gbc);
-        
+
         gbc.weightx = 1.0; //streach
         gbc.gridx = 1;
         gbc.gridwidth = 4;
         gbc.fill = GridBagConstraints.HORIZONTAL;
-        ActionListener ipListener = new ActionListener() {
+        ipField.addActionListener(new ActionListener() {
             public void actionPerformed(ActionEvent e) {
                 portField.requestFocus();
             }
-        };
-        ipField.addActionListener(ipListener);
+        });
         toPanel.add(ipField, gbc);
-        
+
         gbc.weightx = 0.0;
         gbc.gridy = 1;
         gbc.gridx = 0;
         gbc.gridwidth = 1;
         gbc.fill = GridBagConstraints.NONE;
         toPanel.add(portLabel, gbc);
-        
+
         gbc.weightx = 1.0;
         gbc.gridy = 1;
         gbc.gridx = 1;
         gbc.gridwidth = 1;
         gbc.fill = GridBagConstraints.HORIZONTAL;
-        ActionListener connectListener = new ActionListener() {
+        ActionListener connectActionListener =  new ActionListener() {
             public void actionPerformed(ActionEvent e) {
-                connect();
+                controller.connect(ipField.getText(), portField.getText());
             }
         };
-        portField.addActionListener(connectListener);
+        portField.addActionListener(connectActionListener);
         toPanel.add(portField, gbc);
-        
+
         gbc.weightx = 0.0;
         gbc.gridy = 1;
         gbc.gridx = 2;
@@ -121,15 +120,14 @@ public void actionPerformed(ActionEvent e) {
         gbc.fill = GridBagConstraints.NONE;
         portButton.setMnemonic('P');
         portButton.setToolTipText("View Standard Ports");
-        ActionListener portButtonListener = new ActionListener() {
+        portButton.addActionListener(new ActionListener() {
             public void actionPerformed(ActionEvent e) {
-                PortDialog dia = new PortDialog(parent, PortDialog.TCP);
-                dia.show();
+                PortDialog dialog = new PortDialog(parent, PortDialog.TCP);
+                dialog.setVisible(true);
             }
-        };
-        portButton.addActionListener(portButtonListener);
+        });
         toPanel.add(portButton, gbc);
-        
+
         gbc.weightx = 0.0;
         gbc.gridy = 1;
         gbc.gridx = 3;
@@ -137,25 +135,24 @@ public void actionPerformed(ActionEvent e) {
         gbc.fill = GridBagConstraints.NONE;
         connectButton.setMnemonic('C');
         connectButton.setToolTipText("Start Connection");
-        connectButton.addActionListener(connectListener);
+        connectButton.addActionListener(connectActionListener);
         toPanel.add(connectButton, gbc);
-        
-        
+
+
         gbc.weightx = 0.0;
         gbc.gridy = 1;
         gbc.gridx = 4;
         gbc.gridwidth = 1;
         gbc.fill = GridBagConstraints.NONE;
         secureButton.setToolTipText("Set Has Secure");
-        secureButton.addItemListener(
-                new ItemListener() {
+        secureButton.addItemListener(new ItemListener() {
             public void itemStateChanged(ItemEvent e) {
-                isSecure = !isSecure;
+                controller.toggleSecure();
             }
         });
         toPanel.add(secureButton, gbc);
-        
-        
+
+
         toPanel.setBorder(BorderFactory.createTitledBorder(new EtchedBorder(),"Connect To"));
         topPanel.setLayout(new BorderLayout(10,0));
         topPanel.add(toPanel);
@@ -163,8 +160,8 @@ public void itemStateChanged(ItemEvent e) {
         logoLabel.setHorizontalTextPosition(JLabel.CENTER);
         topPanel.add(logoLabel,BorderLayout.EAST);
         topPanel.setBorder(BorderFactory.createEmptyBorder(10,10,5,10));
-        
-        
+
+
         textPanel = new JPanel();
         textPanel.setLayout(new BorderLayout(0,5));
         textPanel.add(convLabel,BorderLayout.NORTH);
@@ -172,7 +169,8 @@ public void itemStateChanged(ItemEvent e) {
         JScrollPane jsp = new JScrollPane(messagesField);
         textPanel.add(jsp);
         textPanel.setBorder(BorderFactory.createEmptyBorder(3,3,0,3));
-        
+        textPanel.add(hexOutputCheckBox, BorderLayout.SOUTH);
+
         sendPanel = new JPanel();
         sendPanel.setLayout(new GridBagLayout());
         gbc.weighty = 0.0;
@@ -196,17 +194,9 @@ public void itemStateChanged(ItemEvent e) {
         sendButton.setToolTipText("Send text to host");
         ActionListener sendListener = new ActionListener() {
             public void actionPerformed(ActionEvent e) {
-                String msg = sendField.getText();
-                if(!msg.equals(""))
-                    sendMessage(msg);
-                else {
-                    int value = JOptionPane.showConfirmDialog(
-                            SocketTestClient.this,  "Send Blank Line ?",
-                            "Send Data To Server",
-                            JOptionPane.YES_NO_OPTION);
-                    if (value == JOptionPane.YES_OPTION)
-                        sendMessage(msg);
-                }
+                String text = sendField.getText();
+                boolean hexInput = hexInputCheckBox.isSelected();
+                controller.buildMessage(text, hexInput);
             }
         };
         sendButton.addActionListener(sendListener);
@@ -216,7 +206,10 @@ public void actionPerformed(ActionEvent e) {
                 new CompoundBorder(
                 BorderFactory.createEmptyBorder(0,0,0,3),
                 BorderFactory.createTitledBorder("Send")));
-        
+
+        gbc.gridx = 1;
+        gbc.gridy = 1;
+        sendPanel.add(hexInputCheckBox, gbc);
         buttonPanel = new JPanel();
         buttonPanel.setLayout(new GridBagLayout());
         gbc.weighty = 0.0;
@@ -237,26 +230,7 @@ public void actionPerformed(ActionEvent e) {
         saveButton.setMnemonic('S');
         ActionListener saveListener = new ActionListener() {
             public void actionPerformed(ActionEvent e) {
-                String text = messagesField.getText();
-                if(text.equals("")) {
-                    error("Nothing to save","Save to file");
-                    return;
-                }
-                String fileName="";
-                JFileChooser chooser = new JFileChooser();
-                chooser.setCurrentDirectory(new File("."));
-                int returnVal = chooser.showSaveDialog(SocketTestClient.this);
-                if(returnVal == JFileChooser.APPROVE_OPTION) {
-                    fileName=chooser.getSelectedFile().getAbsolutePath();
-                    try {
-                        Util.writeFile(fileName,text);
-                    } catch (Exception ioe) {
-                        JOptionPane.showMessageDialog(SocketTestClient.this,
-                                ""+ioe.getMessage(),
-                                "Error saving to file..",
-                                JOptionPane.ERROR_MESSAGE);
-                    }
-                }
+                controller.saveMessages();
             }
         };
         saveButton.addActionListener(saveListener);
@@ -266,145 +240,95 @@ public void actionPerformed(ActionEvent e) {
         clearButton.setMnemonic('C');
         ActionListener clearListener = new ActionListener() {
             public void actionPerformed(ActionEvent e) {
-                messagesField.setText("");
+                clearMessages();
             }
         };
         clearButton.addActionListener(clearListener);
         buttonPanel.add(clearButton, gbc);
         buttonPanel.setBorder(BorderFactory.createEmptyBorder(3,0,0,3));
-        
+
         centerPanel = new JPanel();
         centerPanel.setLayout(new BorderLayout(0,10));
         centerPanel.add(buttonPanel,BorderLayout.SOUTH);
         centerPanel.add(textPanel,BorderLayout.CENTER);
-        
+
         CompoundBorder cb=new CompoundBorder(
                 BorderFactory.createEmptyBorder(5,10,10,10),
                 connectedBorder);
         centerPanel.setBorder(cb);
-        
+
         cp.setLayout(new BorderLayout(10,0));
         cp.add(topPanel,BorderLayout.NORTH);
         cp.add(centerPanel,BorderLayout.CENTER);
     }
-    
-        /*
-        public static void main(String args[]) {
-                SocketTestClient client=new SocketTestClient();
-                client.setTitle("SocketTest Client");
-                //client.pack();
-                client.setSize(500,400);
-                Util.centerWindow(client);
-                client.setDefaultCloseOperation(EXIT_ON_CLOSE);
-                client.setIconImage(client.logo.getImage());
-                client.setVisible(true);
-        }
-         */
-    
-    /////////////////
-    //action methods
-    //////////////////
-    private void connect() {
-        if(socket!=null) {
-            disconnect();
-            return;
-        }
-        String ip=ipField.getText();
-        String port=portField.getText();
-        if(ip==null || ip.equals("")) {
-            JOptionPane.showMessageDialog(SocketTestClient.this,
-                    "No IP Address. Please enter IP Address",
-                    "Error connecting", JOptionPane.ERROR_MESSAGE);
-            ipField.requestFocus();
-            ipField.selectAll();
-            return;
-        }
-        if(port==null || port.equals("")) {
-            JOptionPane.showMessageDialog(SocketTestClient.this,
-                    "No Port number. Please enter Port number",
-                    "Error connecting", JOptionPane.ERROR_MESSAGE);
-            portField.requestFocus();
-            portField.selectAll();
-            return;
-        }
-        setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
-        if(!Util.checkHost(ip)) {
-            JOptionPane.showMessageDialog(SocketTestClient.this,
-                    "Bad IP Address",
-                    "Error connecting", JOptionPane.ERROR_MESSAGE);
-            ipField.requestFocus();
-            ipField.selectAll();
-            setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
-            return;
-        }
-        int portNo = 0;
-        try	{
-            portNo=Integer.parseInt(port);
-        } catch (Exception e) {
-            JOptionPane.showMessageDialog(SocketTestClient.this,
-                    "Bad Port number. Please enter Port number",
-                    "Error connecting", JOptionPane.ERROR_MESSAGE);
-            portField.requestFocus();
-            portField.selectAll();
-            setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
-            return;
+
+    public void clearMessages() {
+        messagesField.setText("");
+    }
+
+    public String chooseFile() {
+        String fileName = null;
+        JFileChooser chooser = new JFileChooser();
+        chooser.setCurrentDirectory(new File("."));
+        int returnVal = chooser.showSaveDialog(SocketTestClient.this);
+        if(returnVal == JFileChooser.APPROVE_OPTION) {
+            fileName = chooser.getSelectedFile().getAbsolutePath();
         }
+        return fileName;
+    }
+
+    public void saveText(String text, String fileName) {
         try {
-            if(isSecure==false) {
-                System.out.println("Connectig in normal mode : "+ip+":"+portNo);
-                socket = new Socket(ip,portNo);
-            } else {
-                System.out.println("Connectig in secure mode : "+ip+":"+portNo);
-                //SocketFactory factory = SSLSocketFactory.getDefault();
-				
-				TrustManager[] tm = new TrustManager[] { new MyTrustManager(SocketTestClient.this) }; 
-
-                SSLContext context = SSLContext.getInstance("TLS");
-                context.init(new KeyManager[0], tm, new SecureRandom());
-
-                SSLSocketFactory factory = context.getSocketFactory();
-                socket = factory.createSocket(ip,portNo);
-            }
-            
-            ipField.setEditable(false);
-            portField.setEditable(false);
-            connectButton.setText("Disconnect");
-            connectButton.setMnemonic('D');
-            connectButton.setToolTipText("Stop Connection");
-            sendButton.setEnabled(true);
-            sendField.setEditable(true);
-        } catch (Exception e) {
-			e.printStackTrace();
-            error(e.getMessage(), "Opening connection");
-            setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
-            return;
+            Util.writeFile(fileName, text);
+        } catch (Exception ioe) {
+            error(""+ioe.getMessage(), "Error saving to file..");
         }
-        changeBorder(" "+socket.getInetAddress().getHostName()+
-                " ["+socket.getInetAddress().getHostAddress()+"] ");
-        setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
-        messagesField.setText("");
-        socketClient=SocketClient.handle(this,socket);
+    }
+
+    public String getMessages() {
+        return messagesField.getText();
+    }
+
+    public SocketTestClient setParent(JFrame parent) {
+        this.parent = parent;
+        return this;
+    }
+
+    public boolean confirm(String title, String message, int option) {
+        return JOptionPane.showConfirmDialog(this, message,
+                title,
+                JOptionPane.YES_NO_OPTION) == option;
+    }
+
+    public void focusSendField() {
         sendField.requestFocus();
     }
-    
-    public synchronized void disconnect() {
-        try {
-            socketClient.setDesonnected(true);
-            socket.close();
-        } catch (Exception e) {
-            System.err.println("Error closing client : "+e);
-        }
-        socket=null;
-        out=null;
-        changeBorder(null);
-        ipField.setEditable(true);
-        portField.setEditable(true);
-        connectButton.setText("Connect");
-        connectButton.setMnemonic('C');
-        connectButton.setToolTipText("Start Connection");
-        sendButton.setEnabled(false);
-        sendField.setEditable(false);
+
+    public void connected() {
+        ipField.setEditable(false);
+        portField.setEditable(false);
+        connectButton.setText("Disconnect");
+        connectButton.setMnemonic('D');
+        connectButton.setToolTipText("Stop Connection");
+        sendButton.setEnabled(true);
+        sendField.setEditable(true);
+    }
+
+    public void focusOnPort() {
+        portField.requestFocus();
+        portField.selectAll();
+    }
+
+    public void focusOnIp() {
+        ipField.requestFocus();
+        ipField.selectAll();
+    }
+
+    public void startWaitInfo() {
+        setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
     }
+
+    @Override
     public void error(String error) {
         if(error==null || error.equals(""))
             return;
@@ -412,6 +336,7 @@ public void error(String error) {
                 error, "Error", JOptionPane.ERROR_MESSAGE);
     }
     
+    @Override
     public void error(String error, String heading) {
         if(error==null || error.equals(""))
             return;
@@ -421,42 +346,16 @@ public void error(String error, String heading) {
     
     public void append(String msg) {
         messagesField.append(msg+NEW_LINE);
-        messagesField.setCaretPosition(messagesField.getText().length());
-    }
-    
-    public void appendnoNewLine(String msg) {
-        messagesField.append(msg);
-        messagesField.setCaretPosition(messagesField.getText().length());
+        messagesField.setCaretPosition(getMessages().length());
     }
-    
-    public void sendMessage(String s) {
-        setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
-        try	{
-            if(out==null) {
-                out = new PrintWriter(new BufferedWriter(
-                        new OutputStreamWriter(socket.getOutputStream())), true);
-            }
-            append("S: "+s);
-            out.print(s+NEW_LINE);
-            out.flush();
-            sendField.setText("");
-            setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
-        } catch (Exception e) {
-            setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
-            JOptionPane.showMessageDialog(SocketTestClient.this,
-                    e.getMessage(),"Error Sending Message",
-                    JOptionPane.ERROR_MESSAGE);
-            disconnect();
-        }
+
+    public void stopWaitInfo() {
+        setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
     }
-    
-    private void changeBorder(String ip) {
-        if(ip==null || ip.equals(""))
-            connectedBorder = BorderFactory.createTitledBorder(
-                    new EtchedBorder(), "Connected To < NONE >");
-        else
-            connectedBorder = BorderFactory.createTitledBorder(
-                    new EtchedBorder(), "Connected To < "+ip+" >");
+
+    public void showConectionInfo(String ip) {
+        connectedBorder = BorderFactory.createTitledBorder(
+                new EtchedBorder(), "Connected To < "+ip+" >");
         CompoundBorder cb=new CompoundBorder(
                 BorderFactory.createEmptyBorder(5,10,10,10),
                 connectedBorder);
@@ -464,5 +363,27 @@ private void changeBorder(String ip) {
         invalidate();
         repaint();
     }
-    
-}
+
+    public void disconnected() {
+        showConectionInfo("NONE");
+        ipField.setEditable(true);
+        portField.setEditable(true);
+        connectButton.setText("Connect");
+        connectButton.setMnemonic('C');
+        connectButton.setToolTipText("Start Connection");
+        sendButton.setEnabled(false);
+        sendField.setEditable(false);
+    }
+
+    public boolean isHexOutput() {
+        return hexOutputCheckBox.isSelected();
+    }
+
+    public void appendMessage(String message) {
+        append(message);
+    }
+
+    public void resetSend() {
+        sendField.setText("");
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/net/sf/sockettest/swing/SocketTestClientView.java b/src/main/java/net/sf/sockettest/swing/SocketTestClientView.java
new file mode 100644
index 0000000..15f22db
--- /dev/null
+++ b/src/main/java/net/sf/sockettest/swing/SocketTestClientView.java
@@ -0,0 +1,33 @@
+package net.sf.sockettest.swing;
+
+public interface SocketTestClientView extends AskView {
+    void focusOnIp();
+
+    void focusOnPort();
+
+    void startWaitInfo();
+
+    void stopWaitInfo();
+
+    void connected();
+
+    void showConectionInfo(String messagge);
+
+    void clearMessages();
+
+    void focusSendField();
+
+    void disconnected();
+
+    boolean isHexOutput();
+
+    void appendMessage(String message);
+
+    void resetSend();
+
+    String getMessages();
+
+    String chooseFile();
+
+    void saveText(String text, String fileName);
+}
diff --git a/src/net/sf/sockettest/swing/SocketTestServer.java b/src/main/java/net/sf/sockettest/swing/SocketTestServer.java
similarity index 50%
rename from src/net/sf/sockettest/swing/SocketTestServer.java
rename to src/main/java/net/sf/sockettest/swing/SocketTestServer.java
index f87919e..3d1d3d1 100644
--- a/src/net/sf/sockettest/swing/SocketTestServer.java
+++ b/src/main/java/net/sf/sockettest/swing/SocketTestServer.java
@@ -3,10 +3,8 @@
 import java.awt.*;
 import java.awt.event.*;
 import javax.swing.*;
-import javax.swing.event.*;
 import javax.swing.border.*;
 
-import java.net.*;
 import java.io.*;
 
 import net.sf.sockettest.*;
@@ -15,11 +13,10 @@
  *
  * @author Akshathkumar Shetty
  */
-public class SocketTestServer extends JPanel /*JFrame*/ {
+public class SocketTestServer extends JPanel implements SocketTestServerView {
     private final String NEW_LINE = "\r\n";
     private ClassLoader cl = getClass().getClassLoader();
-    public ImageIcon logo = new ImageIcon(
-            cl.getResource("icons/logo.gif"));
+    public ImageIcon logo = new ImageIcon(cl.getResource("icons/logo.gif"));
     
     private JPanel topPanel;
     private JPanel toPanel;
@@ -31,15 +28,14 @@ public class SocketTestServer extends JPanel /*JFrame*/ {
     
     private JLabel ipLabel = new JLabel("IP Address");
     private JLabel portLabel = new JLabel("Port");
-    private JLabel logoLabel = new JLabel("SocketTest v 3.0", logo,
-            JLabel.CENTER);
+    private JLabel logoLabel = new JLabel("SocketTest v 3.0", logo, JLabel.CENTER);
     private JTextField ipField = new JTextField("0.0.0.0",20);
     private JTextField portField = new JTextField("21",10);
     private JButton portButton = new JButton("Port");
     private JButton connectButton = new JButton("Start Listening");
-    
+
     private JLabel convLabel = new JLabel("Conversation with Client");
-    private Border connectedBorder = BorderFactory.createTitledBorder(new EtchedBorder(),"Connected Client : < NONE >");
+    private Border connectedBorder;
     private JTextArea messagesField = new JTextArea();
     
     private JLabel sendLabel = new JLabel("Message");
@@ -49,21 +45,23 @@ public class SocketTestServer extends JPanel /*JFrame*/ {
     private JButton disconnectButton = new JButton("Disconnect");
     private JButton saveButton = new JButton("Save");
     private JButton clearButton = new JButton("Clear");
-    
+
+    private JCheckBox hexInputCheckBox = new JCheckBox("Hex Input");
+    private JCheckBox hexOutputCheckBox = new JCheckBox("Hex Output");
+
     private GridBagConstraints gbc = new GridBagConstraints();
-    
-    private Socket socket;
-    private ServerSocket server;
-    private SocketServer socketServer;
-    private PrintWriter out;
-    
-    protected final JFrame parent;
-    
-    public SocketTestServer(final JFrame parent) {
-        //Container cp = getContentPane();
-        this.parent = parent;
+    private JFrame parent;
+
+    private SocketTextServerController controller;
+
+    public SocketTestServer() {
+        buildGUI();
+        showConnectionInfo("NONE");
+    }
+
+    private void buildGUI() {
         Container cp = this;
-        
+
         topPanel = new JPanel();
         toPanel = new JPanel();
         toPanel.setLayout(new GridBagLayout());
@@ -77,26 +75,26 @@ public SocketTestServer(final JFrame parent) {
         gbc.anchor = GridBagConstraints.EAST;
         gbc.fill = GridBagConstraints.NONE;
         toPanel.add(ipLabel, gbc);
-        
+
         gbc.weightx = 1.0; //streach
         gbc.gridx = 1;
         gbc.gridwidth = 3;
         gbc.fill = GridBagConstraints.HORIZONTAL;
         ActionListener ipListener = new ActionListener() {
             public void actionPerformed(ActionEvent e) {
-                portField.requestFocus();
+                focusOnPort();
             }
         };
         ipField.addActionListener(ipListener);
         toPanel.add(ipField, gbc);
-        
+
         gbc.weightx = 0.0;
         gbc.gridy = 1;
         gbc.gridx = 0;
         gbc.gridwidth = 1;
         gbc.fill = GridBagConstraints.NONE;
         toPanel.add(portLabel, gbc);
-        
+
         gbc.weightx = 1.0;
         gbc.gridy = 1;
         gbc.gridx = 1;
@@ -104,12 +102,12 @@ public void actionPerformed(ActionEvent e) {
         gbc.fill = GridBagConstraints.HORIZONTAL;
         ActionListener connectListener = new ActionListener() {
             public void actionPerformed(ActionEvent e) {
-                connect();
+                controller.connect(SocketTestServer.this.ipField.getText(), SocketTestServer.this.portField.getText());
             }
         };
         portField.addActionListener(connectListener);
         toPanel.add(portField, gbc);
-        
+
         gbc.weightx = 0.0;
         gbc.gridy = 1;
         gbc.gridx = 2;
@@ -119,13 +117,13 @@ public void actionPerformed(ActionEvent e) {
         portButton.setToolTipText("View Standard Ports");
         ActionListener portButtonListener = new ActionListener() {
             public void actionPerformed(ActionEvent e) {
-                PortDialog dia = new PortDialog(parent, PortDialog.TCP);
-                dia.show();
+                PortDialog dialog = new PortDialog(parent, PortDialog.TCP);
+                dialog.setVisible(true);
             }
         };
         portButton.addActionListener(portButtonListener);
         toPanel.add(portButton, gbc);
-        
+
         gbc.weightx = 0.0;
         gbc.gridy = 1;
         gbc.gridx = 3;
@@ -135,24 +133,25 @@ public void actionPerformed(ActionEvent e) {
         connectButton.setToolTipText("Start Listening");
         connectButton.addActionListener(connectListener);
         toPanel.add(connectButton, gbc);
-        
-        toPanel.setBorder(BorderFactory.createTitledBorder(new EtchedBorder(),"Listen On"));
-        topPanel.setLayout(new BorderLayout(10,0));
+
+        toPanel.setBorder(BorderFactory.createTitledBorder(new EtchedBorder(), "Listen On"));
+        topPanel.setLayout(new BorderLayout(10, 0));
         topPanel.add(toPanel);
         logoLabel.setVerticalTextPosition(JLabel.BOTTOM);
         logoLabel.setHorizontalTextPosition(JLabel.CENTER);
-        topPanel.add(logoLabel,BorderLayout.EAST);
+        topPanel.add(logoLabel, BorderLayout.EAST);
         topPanel.setBorder(BorderFactory.createEmptyBorder(10,10,5,10));
-        
-        
+
+
         textPanel = new JPanel();
-        textPanel.setLayout(new BorderLayout(0,5));
-        textPanel.add(convLabel,BorderLayout.NORTH);
+        textPanel.setLayout(new BorderLayout(0, 5));
+        textPanel.add(convLabel, BorderLayout.NORTH);
         messagesField.setEditable(false);
         JScrollPane jsp = new JScrollPane(messagesField);
         textPanel.add(jsp);
-        textPanel.setBorder(BorderFactory.createEmptyBorder(3,3,0,3));
-        
+        textPanel.setBorder(BorderFactory.createEmptyBorder(3, 3, 0, 3));
+        textPanel.add(hexOutputCheckBox, BorderLayout.SOUTH);
+
         sendPanel = new JPanel();
         sendPanel.setLayout(new GridBagLayout());
         gbc.weighty = 0.0;
@@ -176,17 +175,7 @@ public void actionPerformed(ActionEvent e) {
         sendButton.setToolTipText("Send text to client");
         ActionListener sendListener = new ActionListener() {
             public void actionPerformed(ActionEvent e) {
-                String msg = sendField.getText();
-                if(!msg.equals(""))
-                    sendMessage(msg);
-                else {
-                    int value = JOptionPane.showConfirmDialog(
-                            SocketTestServer.this,  "Send Blank Line ?",
-                            "Send Data To Client",
-                            JOptionPane.YES_NO_OPTION);
-                    if (value == JOptionPane.YES_OPTION)
-                        sendMessage(msg);
-                }
+                controller.buildMessage(sendField.getText());
             }
         };
         sendButton.addActionListener(sendListener);
@@ -194,19 +183,22 @@ public void actionPerformed(ActionEvent e) {
         sendPanel.add(sendButton, gbc);
         ActionListener disconnectListener = new ActionListener() {
             public void actionPerformed(ActionEvent e) {
-                disconnect();
+                controller.disconnect();
             }
         };
         gbc.gridx = 3;
         disconnectButton.addActionListener(disconnectListener);
         disconnectButton.setEnabled(false);
         sendPanel.add(disconnectButton, gbc);
-        
+        gbc.gridx = 1;
+        gbc.gridy = 1;
+        sendPanel.add(hexInputCheckBox, gbc);
+
         sendPanel.setBorder(
                 new CompoundBorder(
                 BorderFactory.createEmptyBorder(0,0,0,3),
                 BorderFactory.createTitledBorder("Send")));
-        
+
         buttonPanel = new JPanel();
         buttonPanel.setLayout(new GridBagLayout());
         gbc.weighty = 0.0;
@@ -227,26 +219,7 @@ public void actionPerformed(ActionEvent e) {
         saveButton.setMnemonic('S');
         ActionListener saveListener = new ActionListener() {
             public void actionPerformed(ActionEvent e) {
-                String text = messagesField.getText();
-                if(text.equals("")) {
-                    error("Nothing to save","Save to file");
-                    return;
-                }
-                String fileName="";
-                JFileChooser chooser = new JFileChooser();
-                chooser.setCurrentDirectory(new File("."));
-                int returnVal = chooser.showSaveDialog(SocketTestServer.this);
-                if(returnVal == JFileChooser.APPROVE_OPTION) {
-                    fileName=chooser.getSelectedFile().getAbsolutePath();
-                    try {
-                        Util.writeFile(fileName,text);
-                    } catch (Exception ioe) {
-                        JOptionPane.showMessageDialog(SocketTestServer.this,
-                                ""+ioe.getMessage(),
-                                "Error saving to file..",
-                                JOptionPane.ERROR_MESSAGE);
-                    }
-                }
+                controller.saveFile(messagesField.getText());
             }
         };
         saveButton.addActionListener(saveListener);
@@ -262,152 +235,100 @@ public void actionPerformed(ActionEvent e) {
         clearButton.addActionListener(clearListener);
         buttonPanel.add(clearButton, gbc);
         buttonPanel.setBorder(BorderFactory.createEmptyBorder(3,0,0,3));
-        
+
         centerPanel = new JPanel();
         centerPanel.setLayout(new BorderLayout(0,10));
         centerPanel.add(buttonPanel,BorderLayout.SOUTH);
         centerPanel.add(textPanel,BorderLayout.CENTER);
-        
+
         CompoundBorder cb=new CompoundBorder(
                 BorderFactory.createEmptyBorder(5,10,10,10),
                 connectedBorder);
         centerPanel.setBorder(cb);
-        
+
         cp.setLayout(new BorderLayout(10,0));
         cp.add(topPanel,BorderLayout.NORTH);
         cp.add(centerPanel,BorderLayout.CENTER);
     }
-    
-        /*
-        public static void main(String args[]) {
-                SocketTestServer stServer=new SocketTestServer();
-                stServer.setTitle("SocketTest Server");
-                stServer.setSize(500,400);
-                Util.centerWindow(stServer);
-                stServer.setDefaultCloseOperation(EXIT_ON_CLOSE);
-                stServer.setIconImage(stServer.logo.getImage());
-                stServer.setVisible(true);
-        }
-         */
-    
-    /////////////////////
-    //action & helper methods
-    /////////////////////
-    private void connect() {
-        if(server!=null) {
-            stop();
-            return;
-        }
-        String ip=ipField.getText();
-        String port=portField.getText();
-        if(ip==null || ip.equals("")) {
-            JOptionPane.showMessageDialog(SocketTestServer.this,
-                    "No IP Address. Please enter IP Address",
-                    "Error connecting", JOptionPane.ERROR_MESSAGE);
-            ipField.requestFocus();
-            ipField.selectAll();
-            return;
-        }
-        if(port==null || port.equals("")) {
-            JOptionPane.showMessageDialog(SocketTestServer.this,
-                    "No Port number. Please enter Port number",
-                    "Error connecting", JOptionPane.ERROR_MESSAGE);
-            portField.requestFocus();
-            portField.selectAll();
-            return;
-        }
-        setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
-        if(!Util.checkHost(ip)) {
-            JOptionPane.showMessageDialog(SocketTestServer.this,
-                    "Bad IP Address",
-                    "Error connecting", JOptionPane.ERROR_MESSAGE);
-            ipField.requestFocus();
-            ipField.selectAll();
-            setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
-            return;
-        }
-        int portNo = 0;
-        try	{
-            portNo=Integer.parseInt(port);
-        } catch (Exception e) {
-            JOptionPane.showMessageDialog(SocketTestServer.this,
-                    "Bad Port number. Please enter Port number",
-                    "Error connecting", JOptionPane.ERROR_MESSAGE);
-            portField.requestFocus();
-            portField.selectAll();
-            setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
-            return;
-        }
-        try {
-            InetAddress bindAddr=null;
-            if(!ip.equals("0.0.0.0"))
-                bindAddr = InetAddress.getByName(ip);
-            else
-                bindAddr = null;
-            server = new ServerSocket(portNo,1,bindAddr);
-            
-            ipField.setEditable(false);
-            portField.setEditable(false);
-            
-            connectButton.setText("Stop Listening");
-            connectButton.setMnemonic('S');
-            connectButton.setToolTipText("Stop Listening");
-            //sendButton.setEnabled(true);
-            //sendField.setEditable(true);
-        } catch (Exception e) {
-            error(e.getMessage(), "Starting Server at "+portNo);
-            setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
-            return;
+
+    @Override
+    public String chooseFile() {
+        String fileName = null;
+        JFileChooser chooser = new JFileChooser();
+        chooser.setCurrentDirectory(new File("."));
+        int returnVal = chooser.showSaveDialog(SocketTestServer.this);
+        if (returnVal == JFileChooser.APPROVE_OPTION) {
+            fileName = chooser.getSelectedFile().getAbsolutePath();
         }
-        //changeBorder(" "+socket.getInetAddress().getHostName()+
-        //	" ["+socket.getInetAddress().getHostAddress()+"] ");
+        return fileName;
+    }
+
+    @Override
+    public boolean confirm(String title, String message, int option) {
+        int value = JOptionPane.showConfirmDialog(
+                SocketTestServer.this, message,
+                title,
+                JOptionPane.YES_NO_OPTION);
+        return value == option;
+    }
+
+    @Override
+    public boolean isHexInput() {
+        return hexInputCheckBox.isSelected();
+    }
+
+    public SocketTestServer setParent(JFrame parent) {
+        this.parent = parent;
+        return this;
+    }
+
+    @Override
+    public void focusOnPort() {
+        portField.requestFocus();
+        portField.selectAll();
+    }
+
+    @Override
+    public void focusOnIp() {
+        ipField.requestFocus();
+        ipField.selectAll();
+    }
+
+    @Override
+    public void connected() {
+        ipField.setEditable(false);
+        portField.setEditable(false);
+        connectButton.setText("Stop Listening");
+        connectButton.setMnemonic('S');
+        connectButton.setToolTipText("Stop Listening");
+        //sendButton.setEnabled(true);
+        //sendField.setEditable(true);
+    }
+
+    @Override
+    public void stopWaitInfo() {
         setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
-        messagesField.setText("> Server Started on Port: "+portNo+NEW_LINE);
-        append("> ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~");
-        socketServer=SocketServer.handle(this,server);
-        //sendField.requestFocus();
     }
-    //disconnect a client
-    public synchronized void disconnect() {
-        try {
-            socketServer.setDesonnected(true);
-        } catch (Exception e) {}
+
+    @Override
+    public void startWaitInfo() {
+        setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
     }
-    
-    public synchronized void stop() {
-        try {
-            disconnect(); //close any client
-            socketServer.setStop(true);
-        } catch (Exception e) {}
-        server=null;
+
+    public void stopped() {
         ipField.setEditable(true);
         portField.setEditable(true);
         connectButton.setText("Start Listening");
         connectButton.setMnemonic('S');
         connectButton.setToolTipText("Start Listening");
-        append("> Server stopped");
-        append("> ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~");
     }
-    
-    public synchronized void setClientSocket(Socket s) {
-        
-        if(s==null) {
-            out=null;
-            socket = null;
-            changeBorder(null);
-            sendButton.setEnabled(false);
-            sendField.setEditable(false);
-            disconnectButton.setEnabled(false);
-        } else {
-            socket = s;
-            changeBorder(" "+socket.getInetAddress().getHostName()+
-                    " ["+socket.getInetAddress().getHostAddress()+"] ");
-            sendButton.setEnabled(true);
-            sendField.setEditable(true);
-            disconnectButton.setEnabled(true);
-        }
+
+    public void socketSet(boolean b) {
+        sendButton.setEnabled(b);
+        sendField.setEditable(b);
+        disconnectButton.setEnabled(b);
     }
-    
+
     public void error(String error) {
         if(error==null || error.equals(""))
             return;
@@ -422,43 +343,22 @@ public void error(String error, String heading) {
                 error, heading, JOptionPane.ERROR_MESSAGE);
     }
     
-    public void append(String msg) {
+    @Override
+    public void appendMessage(String msg) {
         messagesField.append(msg+NEW_LINE);
         messagesField.setCaretPosition(messagesField.getText().length());
     }
-    
-    public void appendnoNewLine(String msg) {
-        messagesField.append(msg);
-        messagesField.setCaretPosition(messagesField.getText().length());
+
+    public void resetSendField() {
+        sendField.setText("");
     }
-    
-    public void sendMessage(String s) {
-        setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
-        try	{
-            if(out==null) {
-                out = new PrintWriter(new BufferedWriter(
-                        new OutputStreamWriter(socket.getOutputStream())), true);
-            }
-            append("S: "+s);
-            out.print(s+NEW_LINE);
-            out.flush();
-            sendField.setText("");
-            setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
-        } catch (Exception e) {
-            setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
-            JOptionPane.showMessageDialog(SocketTestServer.this,
-                    e.getMessage(),"Error Sending Message",
-                    JOptionPane.ERROR_MESSAGE);
-            disconnect();
-        }
+
+    public boolean isHexOutput() {
+        return hexOutputCheckBox.isSelected();
     }
-    
-    private void changeBorder(String ip) {
-        if(ip==null || ip.equals(""))
-            connectedBorder = BorderFactory.createTitledBorder(
-                    new EtchedBorder(), "Connected Client : < NONE >");
-        else
-            connectedBorder = BorderFactory.createTitledBorder(
+
+    public void showConnectionInfo(String ip) {
+        connectedBorder = BorderFactory.createTitledBorder(
                     new EtchedBorder(), "Connected Client : < "+ip+" >");
         CompoundBorder cb=new CompoundBorder(
                 BorderFactory.createEmptyBorder(5,10,10,10),
@@ -466,5 +366,10 @@ private void changeBorder(String ip) {
         centerPanel.setBorder(cb);
         invalidate();
         repaint();
-    }    
+    }
+
+    public void setController(SocketTextServerController controller) {
+        this.controller = controller;
+        controller.setView(this);
+    }
 }
diff --git a/src/main/java/net/sf/sockettest/swing/SocketTestServerView.java b/src/main/java/net/sf/sockettest/swing/SocketTestServerView.java
new file mode 100644
index 0000000..90eb453
--- /dev/null
+++ b/src/main/java/net/sf/sockettest/swing/SocketTestServerView.java
@@ -0,0 +1,29 @@
+package net.sf.sockettest.swing;
+
+public interface SocketTestServerView extends AskView {
+    String chooseFile();
+
+    boolean isHexInput();
+
+    void focusOnPort();
+
+    void focusOnIp();
+
+    void connected();
+
+    void stopWaitInfo();
+
+    void startWaitInfo();
+
+    void appendMessage(String msg);
+
+    void stopped();
+
+    void showConnectionInfo(String ip);
+
+    void socketSet(boolean set);
+
+    void resetSendField();
+
+    boolean isHexOutput();
+}
diff --git a/src/net/sf/sockettest/swing/SocketTestUdp.java b/src/main/java/net/sf/sockettest/swing/SocketTestUdp.java
similarity index 98%
rename from src/net/sf/sockettest/swing/SocketTestUdp.java
rename to src/main/java/net/sf/sockettest/swing/SocketTestUdp.java
index fe25473..1437645 100644
--- a/src/net/sf/sockettest/swing/SocketTestUdp.java
+++ b/src/main/java/net/sf/sockettest/swing/SocketTestUdp.java
@@ -3,7 +3,6 @@
 import java.awt.*;
 import java.awt.event.*;
 import javax.swing.*;
-import javax.swing.event.*;
 import javax.swing.border.*;
 
 import java.net.*;
@@ -15,7 +14,7 @@
  *
  * @author Akshathkumar Shetty
  */
-public class SocketTestUdp extends JPanel /*JFrame*/ {
+public class SocketTestUdp extends JPanel {
     private final String NEW_LINE = "\r\n";
     private ClassLoader cl = getClass().getClassLoader();
     public ImageIcon logo = new ImageIcon(
@@ -62,11 +61,9 @@ public class SocketTestUdp extends JPanel /*JFrame*/ {
     private DatagramPacket pack;
     private byte buffer[];
     
-    protected final JFrame parent;
+    private JFrame parent;
     
-    public SocketTestUdp(final JFrame parent) {
-        //Container cp = getContentPane();
-        this.parent = parent;
+    public SocketTestUdp() {
         Container cp = this;
         
         northPanel = new JPanel();
@@ -316,7 +313,12 @@ public void actionPerformed(ActionEvent e) {
         cp.add(buttonPanel,BorderLayout.SOUTH);
         
     }
-    
+
+    public SocketTestUdp setParent(JFrame parent) {
+        this.parent = parent;
+        return this;
+    }
+
     /////////////////////
     //action & helper methods
     /////////////////////
diff --git a/src/net/sf/sockettest/swing/SplashScreen.java b/src/main/java/net/sf/sockettest/swing/SplashScreen.java
similarity index 95%
rename from src/net/sf/sockettest/swing/SplashScreen.java
rename to src/main/java/net/sf/sockettest/swing/SplashScreen.java
index 1eb0e74..97d7cb0 100644
--- a/src/net/sf/sockettest/swing/SplashScreen.java
+++ b/src/main/java/net/sf/sockettest/swing/SplashScreen.java
@@ -2,8 +2,7 @@
 
 import java.awt.*;
 import javax.swing.*;
-import javax.swing.border.*;
-import java.awt.event.*;
+
 import net.sf.sockettest.*;
 
 /**
diff --git a/src/icons/ball.gif b/src/main/resources/icons/ball.gif
similarity index 100%
rename from src/icons/ball.gif
rename to src/main/resources/icons/ball.gif
diff --git a/src/icons/logo.gif b/src/main/resources/icons/logo.gif
similarity index 100%
rename from src/icons/logo.gif
rename to src/main/resources/icons/logo.gif
diff --git a/src/readme.txt b/src/main/resources/readme.txt
similarity index 100%
rename from src/readme.txt
rename to src/main/resources/readme.txt
diff --git a/src/tcpports.txt b/src/main/resources/tcpports.txt
similarity index 100%
rename from src/tcpports.txt
rename to src/main/resources/tcpports.txt
diff --git a/src/udpports.txt b/src/main/resources/udpports.txt
similarity index 100%
rename from src/udpports.txt
rename to src/main/resources/udpports.txt
diff --git a/src/test/java/net/sf/sockettest/AppTest.java b/src/test/java/net/sf/sockettest/AppTest.java
new file mode 100644
index 0000000..1da15d5
--- /dev/null
+++ b/src/test/java/net/sf/sockettest/AppTest.java
@@ -0,0 +1,38 @@
+package test.java.net.sf.sockettest;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+/**
+ * Unit test for simple App.
+ */
+public class AppTest 
+    extends TestCase
+{
+    /**
+     * Create the test case
+     *
+     * @param testName name of the test case
+     */
+    public AppTest( String testName )
+    {
+        super( testName );
+    }
+
+    /**
+     * @return the suite of tests being tested
+     */
+    public static Test suite()
+    {
+        return new TestSuite( AppTest.class );
+    }
+
+    /**
+     * Rigourous Test :-)
+     */
+    public void testApp()
+    {
+        assertTrue( true );
+    }
+}