diff --git a/build/build.xml b/build/build.xml
index dabc54564..141b27ff2 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -132,6 +132,23 @@
                                 <pathelement path="${compile.dir}"/>
             </classpath>
         </javac>
+
+    	<mkdir dir="${compile.dir}/workgroup" />
+        <javac
+            destdir="${compile.dir}/workgroup"
+            includeAntRuntime="no"
+            debug="on"
+            source="1.6"
+            target="1.6"
+        >
+            <src path="${basedir}/workgroup/source" />
+            <classpath>
+                <fileset dir="${merge.lib.dir}">
+                    <include name="*.jar"/>
+                </fileset>
+                <pathelement path="${compile.dir}"/>
+            </classpath>
+        </javac>
     </target>
 
     <!-- compile-test -->
@@ -221,7 +238,7 @@
         <bndwrap jars="${debug.jar.name}" output="${debug.jar.name}" />
         <jar file="${debug.jar.name}" update="true">
             <manifest>
-                <attribute name="Bundle-SymbolicName" value="org.igniterealtime.smack-ext-debug" />
+                <attribute name="Bundle-SymbolicName" value="org.igniterealtime.smack-debug" />
             </manifest>
         </jar>
     	
@@ -237,16 +254,35 @@
         <bndwrap jars="${jingle.jar.name}" output="${jingle.jar.name}" />
         <jar file="${jingle.jar.name}" update="true">
             <manifest>
-                <attribute name="Bundle-SymbolicName" value="org.igniterealtime.smack-ext-jingle" />
+                <attribute name="Bundle-SymbolicName" value="org.igniterealtime.smack-jingle" />
             </manifest>
         </jar>
-        <delete file="${compile.dir}/META-INF/smack-config.xml" />
+
+    	<property name="workgroup.jar.name" value="${jar.dest.dir}/smackx-workgroup.jar" />
+        <copy todir="${compile.dir}/workgroup/META-INF" file="${basedir}/workgroup/resources/META-INF/workgroup.providers" />
+        <jar destfile="${workgroup.jar.name}"
+            basedir="${compile.dir}/workgroup"
+            includes="org/jivesoftware/smackx/workgroup/**/*.class, **/workgroup.providers">
+            <manifest>
+                <attribute name="Class-Path" value="smack.jar, smackx.jar" />
+            </manifest>
+        </jar>
+        <bndwrap jars="${workgroup.jar.name}" output="${workgroup.jar.name}" />
+        <jar file="${workgroup.jar.name}" update="true">
+            <manifest>
+                <attribute name="Bundle-SymbolicName" value="org.igniterealtime.smack-workgroup" />
+            </manifest>
+        </jar>
+
+    <!--
+    	<delete file="${compile.dir}/META-INF/smack-config.xml" />
         <delete file="${compile.dir}/META-INF/*.providers" />
         <delete>
             <fileset dir="${compile.dir}/images">
                 <include name="*.png"/>
             </fileset>
         </delete>
+        -->
     </target>
 
     <!-- jar -->
@@ -292,7 +328,7 @@
             <link href="http://java.sun.com/j2se/1.3/docs/api/" />
             <link href="http://java.sun.com/j2ee/sdk_1.2.1/techdocs/api/" />
         </javadoc>
-    </target>
+</target>
 
 
     <!-- test -->
diff --git a/build/eclipse/classpath b/build/eclipse/classpath
index 67dd4e3b5..eadefb938 100644
--- a/build/eclipse/classpath
+++ b/build/eclipse/classpath
@@ -5,6 +5,7 @@
 	<classpathentry kind="src" path="source"/>
 	<classpathentry kind="src" path="test"/>
 	<classpathentry kind="src" path="test-unit"/>
+	<classpathentry kind="src" path="workgroup/source"/>
 	<classpathentry kind="lib" path="build/ant-contrib.jar"/>
 	<classpathentry kind="lib" path="build/asm.jar"/>
 	<classpathentry kind="lib" path="build/build/java-xmlbuilder-0.3.jar"/>
diff --git a/build/release.xml b/build/release.xml
index 745e917c7..bc8466ce6 100644
--- a/build/release.xml
+++ b/build/release.xml
@@ -53,6 +53,7 @@
             <fileset dir="${jar.dest.dir}" includes="smackx.jar" />
             <fileset dir="${jar.dest.dir}" includes="smackx-debug.jar" />
 			<fileset dir="${jar.dest.dir}" includes="smackx-jingle.jar" />
+			<fileset dir="${jar.dest.dir}" includes="smackx-workgroup.jar" />
         </copy>
         <copy todir="${release.samples.dir}">
             <fileset dir="${basedir}/build/resources/META-INF" includes="sample.providers" />
diff --git a/build/resources/META-INF/extension.providers b/build/resources/META-INF/extension.providers
index a0e420c20..123b876d8 100644
--- a/build/resources/META-INF/extension.providers
+++ b/build/resources/META-INF/extension.providers
@@ -265,217 +265,6 @@
         <namespace>http://jabber.org/protocol/commands</namespace>
         <className>org.jivesoftware.smackx.provider.AdHocCommandDataProvider$SessionExpiredError</className>
     </extensionProvider>
-
-
-    <!-- Fastpath providers -->
-    <iqProvider>
-        <elementName>offer</elementName>
-        <namespace>http://jabber.org/protocol/workgroup</namespace>
-        <className>org.jivesoftware.smackx.workgroup.packet.OfferRequestProvider</className>
-    </iqProvider>
-
-    <iqProvider>
-        <elementName>offer-revoke</elementName>
-        <namespace>http://jabber.org/protocol/workgroup</namespace>
-        <className>org.jivesoftware.smackx.workgroup.packet.OfferRevokeProvider</className>
-    </iqProvider>
-
-    <iqProvider>
-        <elementName>agent-status-request</elementName>
-        <namespace>http://jabber.org/protocol/workgroup</namespace>
-        <className>org.jivesoftware.smackx.workgroup.packet.AgentStatusRequest$Provider</className>
-    </iqProvider>
-
-    <iqProvider>
-        <elementName>transcripts</elementName>
-        <namespace>http://jivesoftware.com/protocol/workgroup</namespace>
-        <className>org.jivesoftware.smackx.workgroup.packet.TranscriptsProvider</className>
-    </iqProvider>
-
-    <iqProvider>
-        <elementName>transcript</elementName>
-        <namespace>http://jivesoftware.com/protocol/workgroup</namespace>
-        <className>org.jivesoftware.smackx.workgroup.packet.TranscriptProvider</className>
-    </iqProvider>
-
-    <iqProvider>
-        <elementName>workgroups</elementName>
-        <namespace>http://jabber.org/protocol/workgroup</namespace>
-        <className>org.jivesoftware.smackx.workgroup.packet.AgentWorkgroups$Provider</className>
-    </iqProvider>
-
-    <iqProvider>
-        <elementName>agent-info</elementName>
-        <namespace>http://jivesoftware.com/protocol/workgroup</namespace>
-        <className>org.jivesoftware.smackx.workgroup.packet.AgentInfo$Provider</className>
-    </iqProvider>
-
-    <iqProvider>
-        <elementName>transcript-search</elementName>
-        <namespace>http://jivesoftware.com/protocol/workgroup</namespace>
-        <className>org.jivesoftware.smackx.workgroup.packet.TranscriptSearch$Provider</className>
-    </iqProvider>
-
-    <iqProvider>
-        <elementName>occupants-info</elementName>
-        <namespace>http://jivesoftware.com/protocol/workgroup</namespace>
-        <className>org.jivesoftware.smackx.workgroup.packet.OccupantsInfo$Provider</className>
-    </iqProvider>
-
-    <iqProvider>
-        <elementName>chat-settings</elementName>
-        <namespace>http://jivesoftware.com/protocol/workgroup</namespace>
-        <className>org.jivesoftware.smackx.workgroup.settings.ChatSettings$InternalProvider</className>
-    </iqProvider>
-
-    <iqProvider>
-        <elementName>chat-notes</elementName>
-        <namespace>http://jivesoftware.com/protocol/workgroup</namespace>
-        <className>org.jivesoftware.smackx.workgroup.ext.notes.ChatNotes$Provider</className>
-    </iqProvider>
-
-    <iqProvider>
-        <elementName>chat-sessions</elementName>
-        <namespace>http://jivesoftware.com/protocol/workgroup</namespace>
-        <className>org.jivesoftware.smackx.workgroup.ext.history.AgentChatHistory$InternalProvider</className>
-    </iqProvider>
-
-    <iqProvider>
-        <elementName>offline-settings</elementName>
-        <namespace>http://jivesoftware.com/protocol/workgroup</namespace>
-        <className>org.jivesoftware.smackx.workgroup.settings.OfflineSettings$InternalProvider</className>
-    </iqProvider>
-
-    <iqProvider>
-        <elementName>sound-settings</elementName>
-        <namespace>http://jivesoftware.com/protocol/workgroup</namespace>
-        <className>org.jivesoftware.smackx.workgroup.settings.SoundSettings$InternalProvider</className>
-    </iqProvider>
-
-     <iqProvider>
-        <elementName>workgroup-properties</elementName>
-        <namespace>http://jivesoftware.com/protocol/workgroup</namespace>
-        <className>org.jivesoftware.smackx.workgroup.settings.WorkgroupProperties$InternalProvider</className>
-    </iqProvider>
-
-
-    <iqProvider>
-        <elementName>search-settings</elementName>
-        <namespace>http://jivesoftware.com/protocol/workgroup</namespace>
-        <className>org.jivesoftware.smackx.workgroup.settings.SearchSettings$InternalProvider</className>
-    </iqProvider>
-
-    <iqProvider>
-        <elementName>workgroup-form</elementName>
-        <namespace>http://jivesoftware.com/protocol/workgroup</namespace>
-        <className>org.jivesoftware.smackx.workgroup.ext.forms.WorkgroupForm$InternalProvider</className>
-    </iqProvider>
-
-    <iqProvider>
-        <elementName>macros</elementName>
-        <namespace>http://jivesoftware.com/protocol/workgroup</namespace>
-        <className>org.jivesoftware.smackx.workgroup.ext.macros.Macros$InternalProvider</className>
-    </iqProvider>
-
-    <iqProvider>
-        <elementName>chat-metadata</elementName>
-        <namespace>http://jivesoftware.com/protocol/workgroup</namespace>
-        <className>org.jivesoftware.smackx.workgroup.ext.history.ChatMetadata$Provider</className>
-    </iqProvider>
-<!--
-	
-	org.jivesoftware.smackx.workgroup.site is missing ... 
-
-    <iqProvider>
-        <elementName>site-user</elementName>
-        <namespace>http://jivesoftware.com/protocol/workgroup</namespace>
-        <className>org.jivesoftware.smackx.workgroup.site.SiteUser$Provider</className>
-    </iqProvider>
-
-    <iqProvider>
-        <elementName>site-invite</elementName>
-        <namespace>http://jivesoftware.com/protocol/workgroup</namespace>
-        <className>org.jivesoftware.smackx.workgroup.site.SiteInvitation$Provider</className>
-    </iqProvider>
-
-    <iqProvider>
-        <elementName>site-user-history</elementName>
-        <namespace>http://jivesoftware.com/protocol/workgroup</namespace>
-        <className>org.jivesoftware.smackx.workgroup.site.SiteUserHistory$Provider</className>
-    </iqProvider>
--->
-    <iqProvider>
-        <elementName>generic-metadata</elementName>
-        <namespace>http://jivesoftware.com/protocol/workgroup</namespace>
-        <className>org.jivesoftware.smackx.workgroup.settings.GenericSettings$InternalProvider</className>
-    </iqProvider>
-
-    <iqProvider>
-        <elementName>monitor</elementName>
-        <namespace>http://jivesoftware.com/protocol/workgroup</namespace>
-        <className>org.jivesoftware.smackx.workgroup.packet.MonitorPacket$InternalProvider</className>
-    </iqProvider>
-
-    <!-- Packet Extension Providers -->
-    <extensionProvider>
-        <elementName>queue-status</elementName>
-        <namespace>http://jabber.org/protocol/workgroup</namespace>
-        <className>org.jivesoftware.smackx.workgroup.packet.QueueUpdate$Provider</className>
-    </extensionProvider>
-
-    <extensionProvider>
-        <elementName>workgroup</elementName>
-        <namespace>http://jabber.org/protocol/workgroup</namespace>
-        <className>org.jivesoftware.smackx.workgroup.packet.WorkgroupInformation$Provider</className>
-    </extensionProvider>
-
-    <extensionProvider>
-        <elementName>metadata</elementName>
-        <namespace>http://jivesoftware.com/protocol/workgroup</namespace>
-        <className>org.jivesoftware.smackx.workgroup.packet.MetaDataProvider</className>
-    </extensionProvider>
-
-    <extensionProvider>
-        <elementName>session</elementName>
-        <namespace>http://jivesoftware.com/protocol/workgroup</namespace>
-        <className>org.jivesoftware.smackx.workgroup.packet.SessionID$Provider</className>
-    </extensionProvider>
-
-    <extensionProvider>
-        <elementName>user</elementName>
-        <namespace>http://jivesoftware.com/protocol/workgroup</namespace>
-        <className>org.jivesoftware.smackx.workgroup.packet.UserID$Provider</className>
-    </extensionProvider>
-
-    <extensionProvider>
-        <elementName>agent-status</elementName>
-        <namespace>http://jabber.org/protocol/workgroup</namespace>
-        <className>org.jivesoftware.smackx.workgroup.packet.AgentStatus$Provider</className>
-    </extensionProvider>
-
-    <extensionProvider>
-        <elementName>notify-queue-details</elementName>
-        <namespace>http://jabber.org/protocol/workgroup</namespace>
-        <className>org.jivesoftware.smackx.workgroup.packet.QueueDetails$Provider</className>
-    </extensionProvider>
-
-    <extensionProvider>
-        <elementName>notify-queue</elementName>
-        <namespace>http://jabber.org/protocol/workgroup</namespace>
-        <className>org.jivesoftware.smackx.workgroup.packet.QueueOverview$Provider</className>
-    </extensionProvider>
-
-    <extensionProvider>
-        <elementName>invite</elementName>
-        <namespace>http://jabber.org/protocol/workgroup</namespace>
-        <className>org.jivesoftware.smackx.workgroup.packet.RoomInvitation$Provider</className>
-    </extensionProvider>
-
-    <extensionProvider>
-        <elementName>transfer</elementName>
-        <namespace>http://jabber.org/protocol/workgroup</namespace>
-        <className>org.jivesoftware.smackx.workgroup.packet.RoomTransfer$Provider</className>
-    </extensionProvider>
     
     <!-- SHIM -->
     <extensionProvider>
diff --git a/workgroup/resources/META-INF/workgroup.providers b/workgroup/resources/META-INF/workgroup.providers
new file mode 100644
index 000000000..cc7085085
--- /dev/null
+++ b/workgroup/resources/META-INF/workgroup.providers
@@ -0,0 +1,214 @@
+<?xml version="1.0"?> 
+<!-- Providers for workgroup extensions -->
+<smackProviders> 
+    <!-- Fastpath providers -->
+    <iqProvider>
+        <elementName>offer</elementName>
+        <namespace>http://jabber.org/protocol/workgroup</namespace>
+        <className>org.jivesoftware.smackx.workgroup.packet.OfferRequestProvider</className>
+    </iqProvider>
+
+    <iqProvider>
+        <elementName>offer-revoke</elementName>
+        <namespace>http://jabber.org/protocol/workgroup</namespace>
+        <className>org.jivesoftware.smackx.workgroup.packet.OfferRevokeProvider</className>
+    </iqProvider>
+
+    <iqProvider>
+        <elementName>agent-status-request</elementName>
+        <namespace>http://jabber.org/protocol/workgroup</namespace>
+        <className>org.jivesoftware.smackx.workgroup.packet.AgentStatusRequest$Provider</className>
+    </iqProvider>
+
+    <iqProvider>
+        <elementName>transcripts</elementName>
+        <namespace>http://jivesoftware.com/protocol/workgroup</namespace>
+        <className>org.jivesoftware.smackx.workgroup.packet.TranscriptsProvider</className>
+    </iqProvider>
+
+    <iqProvider>
+        <elementName>transcript</elementName>
+        <namespace>http://jivesoftware.com/protocol/workgroup</namespace>
+        <className>org.jivesoftware.smackx.workgroup.packet.TranscriptProvider</className>
+    </iqProvider>
+
+    <iqProvider>
+        <elementName>workgroups</elementName>
+        <namespace>http://jabber.org/protocol/workgroup</namespace>
+        <className>org.jivesoftware.smackx.workgroup.packet.AgentWorkgroups$Provider</className>
+    </iqProvider>
+
+    <iqProvider>
+        <elementName>agent-info</elementName>
+        <namespace>http://jivesoftware.com/protocol/workgroup</namespace>
+        <className>org.jivesoftware.smackx.workgroup.packet.AgentInfo$Provider</className>
+    </iqProvider>
+
+    <iqProvider>
+        <elementName>transcript-search</elementName>
+        <namespace>http://jivesoftware.com/protocol/workgroup</namespace>
+        <className>org.jivesoftware.smackx.workgroup.packet.TranscriptSearch$Provider</className>
+    </iqProvider>
+
+    <iqProvider>
+        <elementName>occupants-info</elementName>
+        <namespace>http://jivesoftware.com/protocol/workgroup</namespace>
+        <className>org.jivesoftware.smackx.workgroup.packet.OccupantsInfo$Provider</className>
+    </iqProvider>
+
+    <iqProvider>
+        <elementName>chat-settings</elementName>
+        <namespace>http://jivesoftware.com/protocol/workgroup</namespace>
+        <className>org.jivesoftware.smackx.workgroup.settings.ChatSettings$InternalProvider</className>
+    </iqProvider>
+
+    <iqProvider>
+        <elementName>chat-notes</elementName>
+        <namespace>http://jivesoftware.com/protocol/workgroup</namespace>
+        <className>org.jivesoftware.smackx.workgroup.ext.notes.ChatNotes$Provider</className>
+    </iqProvider>
+
+    <iqProvider>
+        <elementName>chat-sessions</elementName>
+        <namespace>http://jivesoftware.com/protocol/workgroup</namespace>
+        <className>org.jivesoftware.smackx.workgroup.ext.history.AgentChatHistory$InternalProvider</className>
+    </iqProvider>
+
+    <iqProvider>
+        <elementName>offline-settings</elementName>
+        <namespace>http://jivesoftware.com/protocol/workgroup</namespace>
+        <className>org.jivesoftware.smackx.workgroup.settings.OfflineSettings$InternalProvider</className>
+    </iqProvider>
+
+    <iqProvider>
+        <elementName>sound-settings</elementName>
+        <namespace>http://jivesoftware.com/protocol/workgroup</namespace>
+        <className>org.jivesoftware.smackx.workgroup.settings.SoundSettings$InternalProvider</className>
+    </iqProvider>
+
+     <iqProvider>
+        <elementName>workgroup-properties</elementName>
+        <namespace>http://jivesoftware.com/protocol/workgroup</namespace>
+        <className>org.jivesoftware.smackx.workgroup.settings.WorkgroupProperties$InternalProvider</className>
+    </iqProvider>
+
+
+    <iqProvider>
+        <elementName>search-settings</elementName>
+        <namespace>http://jivesoftware.com/protocol/workgroup</namespace>
+        <className>org.jivesoftware.smackx.workgroup.settings.SearchSettings$InternalProvider</className>
+    </iqProvider>
+
+    <iqProvider>
+        <elementName>workgroup-form</elementName>
+        <namespace>http://jivesoftware.com/protocol/workgroup</namespace>
+        <className>org.jivesoftware.smackx.workgroup.ext.forms.WorkgroupForm$InternalProvider</className>
+    </iqProvider>
+
+    <iqProvider>
+        <elementName>macros</elementName>
+        <namespace>http://jivesoftware.com/protocol/workgroup</namespace>
+        <className>org.jivesoftware.smackx.workgroup.ext.macros.Macros$InternalProvider</className>
+    </iqProvider>
+
+    <iqProvider>
+        <elementName>chat-metadata</elementName>
+        <namespace>http://jivesoftware.com/protocol/workgroup</namespace>
+        <className>org.jivesoftware.smackx.workgroup.ext.history.ChatMetadata$Provider</className>
+    </iqProvider>
+<!--
+	
+	org.jivesoftware.smackx.workgroup.site is missing ... 
+
+    <iqProvider>
+        <elementName>site-user</elementName>
+        <namespace>http://jivesoftware.com/protocol/workgroup</namespace>
+        <className>org.jivesoftware.smackx.workgroup.site.SiteUser$Provider</className>
+    </iqProvider>
+
+    <iqProvider>
+        <elementName>site-invite</elementName>
+        <namespace>http://jivesoftware.com/protocol/workgroup</namespace>
+        <className>org.jivesoftware.smackx.workgroup.site.SiteInvitation$Provider</className>
+    </iqProvider>
+
+    <iqProvider>
+        <elementName>site-user-history</elementName>
+        <namespace>http://jivesoftware.com/protocol/workgroup</namespace>
+        <className>org.jivesoftware.smackx.workgroup.site.SiteUserHistory$Provider</className>
+    </iqProvider>
+-->
+    <iqProvider>
+        <elementName>generic-metadata</elementName>
+        <namespace>http://jivesoftware.com/protocol/workgroup</namespace>
+        <className>org.jivesoftware.smackx.workgroup.settings.GenericSettings$InternalProvider</className>
+    </iqProvider>
+
+    <iqProvider>
+        <elementName>monitor</elementName>
+        <namespace>http://jivesoftware.com/protocol/workgroup</namespace>
+        <className>org.jivesoftware.smackx.workgroup.packet.MonitorPacket$InternalProvider</className>
+    </iqProvider>
+
+    <!-- Packet Extension Providers -->
+    <extensionProvider>
+        <elementName>queue-status</elementName>
+        <namespace>http://jabber.org/protocol/workgroup</namespace>
+        <className>org.jivesoftware.smackx.workgroup.packet.QueueUpdate$Provider</className>
+    </extensionProvider>
+
+    <extensionProvider>
+        <elementName>workgroup</elementName>
+        <namespace>http://jabber.org/protocol/workgroup</namespace>
+        <className>org.jivesoftware.smackx.workgroup.packet.WorkgroupInformation$Provider</className>
+    </extensionProvider>
+
+    <extensionProvider>
+        <elementName>metadata</elementName>
+        <namespace>http://jivesoftware.com/protocol/workgroup</namespace>
+        <className>org.jivesoftware.smackx.workgroup.packet.MetaDataProvider</className>
+    </extensionProvider>
+
+    <extensionProvider>
+        <elementName>session</elementName>
+        <namespace>http://jivesoftware.com/protocol/workgroup</namespace>
+        <className>org.jivesoftware.smackx.workgroup.packet.SessionID$Provider</className>
+    </extensionProvider>
+
+    <extensionProvider>
+        <elementName>user</elementName>
+        <namespace>http://jivesoftware.com/protocol/workgroup</namespace>
+        <className>org.jivesoftware.smackx.workgroup.packet.UserID$Provider</className>
+    </extensionProvider>
+
+    <extensionProvider>
+        <elementName>agent-status</elementName>
+        <namespace>http://jabber.org/protocol/workgroup</namespace>
+        <className>org.jivesoftware.smackx.workgroup.packet.AgentStatus$Provider</className>
+    </extensionProvider>
+
+    <extensionProvider>
+        <elementName>notify-queue-details</elementName>
+        <namespace>http://jabber.org/protocol/workgroup</namespace>
+        <className>org.jivesoftware.smackx.workgroup.packet.QueueDetails$Provider</className>
+    </extensionProvider>
+
+    <extensionProvider>
+        <elementName>notify-queue</elementName>
+        <namespace>http://jabber.org/protocol/workgroup</namespace>
+        <className>org.jivesoftware.smackx.workgroup.packet.QueueOverview$Provider</className>
+    </extensionProvider>
+
+    <extensionProvider>
+        <elementName>invite</elementName>
+        <namespace>http://jabber.org/protocol/workgroup</namespace>
+        <className>org.jivesoftware.smackx.workgroup.packet.RoomInvitation$Provider</className>
+    </extensionProvider>
+
+    <extensionProvider>
+        <elementName>transfer</elementName>
+        <namespace>http://jabber.org/protocol/workgroup</namespace>
+        <className>org.jivesoftware.smackx.workgroup.packet.RoomTransfer$Provider</className>
+    </extensionProvider>
+    
+</smackProviders>
diff --git a/source/org/jivesoftware/smackx/workgroup/MetaData.java b/workgroup/source/org/jivesoftware/smackx/workgroup/MetaData.java
similarity index 100%
rename from source/org/jivesoftware/smackx/workgroup/MetaData.java
rename to workgroup/source/org/jivesoftware/smackx/workgroup/MetaData.java
diff --git a/source/org/jivesoftware/smackx/workgroup/QueueUser.java b/workgroup/source/org/jivesoftware/smackx/workgroup/QueueUser.java
similarity index 100%
rename from source/org/jivesoftware/smackx/workgroup/QueueUser.java
rename to workgroup/source/org/jivesoftware/smackx/workgroup/QueueUser.java
diff --git a/source/org/jivesoftware/smackx/workgroup/WorkgroupInvitation.java b/workgroup/source/org/jivesoftware/smackx/workgroup/WorkgroupInvitation.java
similarity index 100%
rename from source/org/jivesoftware/smackx/workgroup/WorkgroupInvitation.java
rename to workgroup/source/org/jivesoftware/smackx/workgroup/WorkgroupInvitation.java
diff --git a/source/org/jivesoftware/smackx/workgroup/WorkgroupInvitationListener.java b/workgroup/source/org/jivesoftware/smackx/workgroup/WorkgroupInvitationListener.java
similarity index 100%
rename from source/org/jivesoftware/smackx/workgroup/WorkgroupInvitationListener.java
rename to workgroup/source/org/jivesoftware/smackx/workgroup/WorkgroupInvitationListener.java
diff --git a/source/org/jivesoftware/smackx/workgroup/agent/Agent.java b/workgroup/source/org/jivesoftware/smackx/workgroup/agent/Agent.java
similarity index 100%
rename from source/org/jivesoftware/smackx/workgroup/agent/Agent.java
rename to workgroup/source/org/jivesoftware/smackx/workgroup/agent/Agent.java
diff --git a/source/org/jivesoftware/smackx/workgroup/agent/AgentRoster.java b/workgroup/source/org/jivesoftware/smackx/workgroup/agent/AgentRoster.java
similarity index 100%
rename from source/org/jivesoftware/smackx/workgroup/agent/AgentRoster.java
rename to workgroup/source/org/jivesoftware/smackx/workgroup/agent/AgentRoster.java
diff --git a/source/org/jivesoftware/smackx/workgroup/agent/AgentRosterListener.java b/workgroup/source/org/jivesoftware/smackx/workgroup/agent/AgentRosterListener.java
similarity index 100%
rename from source/org/jivesoftware/smackx/workgroup/agent/AgentRosterListener.java
rename to workgroup/source/org/jivesoftware/smackx/workgroup/agent/AgentRosterListener.java
diff --git a/source/org/jivesoftware/smackx/workgroup/agent/AgentSession.java b/workgroup/source/org/jivesoftware/smackx/workgroup/agent/AgentSession.java
similarity index 100%
rename from source/org/jivesoftware/smackx/workgroup/agent/AgentSession.java
rename to workgroup/source/org/jivesoftware/smackx/workgroup/agent/AgentSession.java
diff --git a/source/org/jivesoftware/smackx/workgroup/agent/InvitationRequest.java b/workgroup/source/org/jivesoftware/smackx/workgroup/agent/InvitationRequest.java
similarity index 100%
rename from source/org/jivesoftware/smackx/workgroup/agent/InvitationRequest.java
rename to workgroup/source/org/jivesoftware/smackx/workgroup/agent/InvitationRequest.java
diff --git a/source/org/jivesoftware/smackx/workgroup/agent/Offer.java b/workgroup/source/org/jivesoftware/smackx/workgroup/agent/Offer.java
similarity index 100%
rename from source/org/jivesoftware/smackx/workgroup/agent/Offer.java
rename to workgroup/source/org/jivesoftware/smackx/workgroup/agent/Offer.java
diff --git a/source/org/jivesoftware/smackx/workgroup/agent/OfferConfirmation.java b/workgroup/source/org/jivesoftware/smackx/workgroup/agent/OfferConfirmation.java
similarity index 100%
rename from source/org/jivesoftware/smackx/workgroup/agent/OfferConfirmation.java
rename to workgroup/source/org/jivesoftware/smackx/workgroup/agent/OfferConfirmation.java
diff --git a/source/org/jivesoftware/smackx/workgroup/agent/OfferConfirmationListener.java b/workgroup/source/org/jivesoftware/smackx/workgroup/agent/OfferConfirmationListener.java
similarity index 100%
rename from source/org/jivesoftware/smackx/workgroup/agent/OfferConfirmationListener.java
rename to workgroup/source/org/jivesoftware/smackx/workgroup/agent/OfferConfirmationListener.java
diff --git a/source/org/jivesoftware/smackx/workgroup/agent/OfferContent.java b/workgroup/source/org/jivesoftware/smackx/workgroup/agent/OfferContent.java
similarity index 100%
rename from source/org/jivesoftware/smackx/workgroup/agent/OfferContent.java
rename to workgroup/source/org/jivesoftware/smackx/workgroup/agent/OfferContent.java
diff --git a/source/org/jivesoftware/smackx/workgroup/agent/OfferListener.java b/workgroup/source/org/jivesoftware/smackx/workgroup/agent/OfferListener.java
similarity index 100%
rename from source/org/jivesoftware/smackx/workgroup/agent/OfferListener.java
rename to workgroup/source/org/jivesoftware/smackx/workgroup/agent/OfferListener.java
diff --git a/source/org/jivesoftware/smackx/workgroup/agent/QueueUsersListener.java b/workgroup/source/org/jivesoftware/smackx/workgroup/agent/QueueUsersListener.java
similarity index 100%
rename from source/org/jivesoftware/smackx/workgroup/agent/QueueUsersListener.java
rename to workgroup/source/org/jivesoftware/smackx/workgroup/agent/QueueUsersListener.java
diff --git a/source/org/jivesoftware/smackx/workgroup/agent/RevokedOffer.java b/workgroup/source/org/jivesoftware/smackx/workgroup/agent/RevokedOffer.java
similarity index 100%
rename from source/org/jivesoftware/smackx/workgroup/agent/RevokedOffer.java
rename to workgroup/source/org/jivesoftware/smackx/workgroup/agent/RevokedOffer.java
diff --git a/source/org/jivesoftware/smackx/workgroup/agent/TranscriptManager.java b/workgroup/source/org/jivesoftware/smackx/workgroup/agent/TranscriptManager.java
similarity index 100%
rename from source/org/jivesoftware/smackx/workgroup/agent/TranscriptManager.java
rename to workgroup/source/org/jivesoftware/smackx/workgroup/agent/TranscriptManager.java
diff --git a/source/org/jivesoftware/smackx/workgroup/agent/TranscriptSearchManager.java b/workgroup/source/org/jivesoftware/smackx/workgroup/agent/TranscriptSearchManager.java
similarity index 100%
rename from source/org/jivesoftware/smackx/workgroup/agent/TranscriptSearchManager.java
rename to workgroup/source/org/jivesoftware/smackx/workgroup/agent/TranscriptSearchManager.java
diff --git a/source/org/jivesoftware/smackx/workgroup/agent/TransferRequest.java b/workgroup/source/org/jivesoftware/smackx/workgroup/agent/TransferRequest.java
similarity index 100%
rename from source/org/jivesoftware/smackx/workgroup/agent/TransferRequest.java
rename to workgroup/source/org/jivesoftware/smackx/workgroup/agent/TransferRequest.java
diff --git a/source/org/jivesoftware/smackx/workgroup/agent/UserRequest.java b/workgroup/source/org/jivesoftware/smackx/workgroup/agent/UserRequest.java
similarity index 100%
rename from source/org/jivesoftware/smackx/workgroup/agent/UserRequest.java
rename to workgroup/source/org/jivesoftware/smackx/workgroup/agent/UserRequest.java
diff --git a/source/org/jivesoftware/smackx/workgroup/agent/WorkgroupQueue.java b/workgroup/source/org/jivesoftware/smackx/workgroup/agent/WorkgroupQueue.java
similarity index 100%
rename from source/org/jivesoftware/smackx/workgroup/agent/WorkgroupQueue.java
rename to workgroup/source/org/jivesoftware/smackx/workgroup/agent/WorkgroupQueue.java
diff --git a/source/org/jivesoftware/smackx/workgroup/ext/forms/WorkgroupForm.java b/workgroup/source/org/jivesoftware/smackx/workgroup/ext/forms/WorkgroupForm.java
similarity index 100%
rename from source/org/jivesoftware/smackx/workgroup/ext/forms/WorkgroupForm.java
rename to workgroup/source/org/jivesoftware/smackx/workgroup/ext/forms/WorkgroupForm.java
diff --git a/source/org/jivesoftware/smackx/workgroup/ext/history/AgentChatHistory.java b/workgroup/source/org/jivesoftware/smackx/workgroup/ext/history/AgentChatHistory.java
similarity index 100%
rename from source/org/jivesoftware/smackx/workgroup/ext/history/AgentChatHistory.java
rename to workgroup/source/org/jivesoftware/smackx/workgroup/ext/history/AgentChatHistory.java
diff --git a/source/org/jivesoftware/smackx/workgroup/ext/history/AgentChatSession.java b/workgroup/source/org/jivesoftware/smackx/workgroup/ext/history/AgentChatSession.java
similarity index 100%
rename from source/org/jivesoftware/smackx/workgroup/ext/history/AgentChatSession.java
rename to workgroup/source/org/jivesoftware/smackx/workgroup/ext/history/AgentChatSession.java
diff --git a/source/org/jivesoftware/smackx/workgroup/ext/history/ChatMetadata.java b/workgroup/source/org/jivesoftware/smackx/workgroup/ext/history/ChatMetadata.java
similarity index 100%
rename from source/org/jivesoftware/smackx/workgroup/ext/history/ChatMetadata.java
rename to workgroup/source/org/jivesoftware/smackx/workgroup/ext/history/ChatMetadata.java
diff --git a/source/org/jivesoftware/smackx/workgroup/ext/macros/Macro.java b/workgroup/source/org/jivesoftware/smackx/workgroup/ext/macros/Macro.java
similarity index 100%
rename from source/org/jivesoftware/smackx/workgroup/ext/macros/Macro.java
rename to workgroup/source/org/jivesoftware/smackx/workgroup/ext/macros/Macro.java
diff --git a/source/org/jivesoftware/smackx/workgroup/ext/macros/MacroGroup.java b/workgroup/source/org/jivesoftware/smackx/workgroup/ext/macros/MacroGroup.java
similarity index 100%
rename from source/org/jivesoftware/smackx/workgroup/ext/macros/MacroGroup.java
rename to workgroup/source/org/jivesoftware/smackx/workgroup/ext/macros/MacroGroup.java
diff --git a/source/org/jivesoftware/smackx/workgroup/ext/macros/Macros.java b/workgroup/source/org/jivesoftware/smackx/workgroup/ext/macros/Macros.java
similarity index 100%
rename from source/org/jivesoftware/smackx/workgroup/ext/macros/Macros.java
rename to workgroup/source/org/jivesoftware/smackx/workgroup/ext/macros/Macros.java
diff --git a/source/org/jivesoftware/smackx/workgroup/ext/notes/ChatNotes.java b/workgroup/source/org/jivesoftware/smackx/workgroup/ext/notes/ChatNotes.java
similarity index 100%
rename from source/org/jivesoftware/smackx/workgroup/ext/notes/ChatNotes.java
rename to workgroup/source/org/jivesoftware/smackx/workgroup/ext/notes/ChatNotes.java
diff --git a/source/org/jivesoftware/smackx/workgroup/packet/AgentInfo.java b/workgroup/source/org/jivesoftware/smackx/workgroup/packet/AgentInfo.java
similarity index 100%
rename from source/org/jivesoftware/smackx/workgroup/packet/AgentInfo.java
rename to workgroup/source/org/jivesoftware/smackx/workgroup/packet/AgentInfo.java
diff --git a/source/org/jivesoftware/smackx/workgroup/packet/AgentStatus.java b/workgroup/source/org/jivesoftware/smackx/workgroup/packet/AgentStatus.java
similarity index 100%
rename from source/org/jivesoftware/smackx/workgroup/packet/AgentStatus.java
rename to workgroup/source/org/jivesoftware/smackx/workgroup/packet/AgentStatus.java
diff --git a/source/org/jivesoftware/smackx/workgroup/packet/AgentStatusRequest.java b/workgroup/source/org/jivesoftware/smackx/workgroup/packet/AgentStatusRequest.java
similarity index 100%
rename from source/org/jivesoftware/smackx/workgroup/packet/AgentStatusRequest.java
rename to workgroup/source/org/jivesoftware/smackx/workgroup/packet/AgentStatusRequest.java
diff --git a/source/org/jivesoftware/smackx/workgroup/packet/AgentWorkgroups.java b/workgroup/source/org/jivesoftware/smackx/workgroup/packet/AgentWorkgroups.java
similarity index 100%
rename from source/org/jivesoftware/smackx/workgroup/packet/AgentWorkgroups.java
rename to workgroup/source/org/jivesoftware/smackx/workgroup/packet/AgentWorkgroups.java
diff --git a/source/org/jivesoftware/smackx/workgroup/packet/DepartQueuePacket.java b/workgroup/source/org/jivesoftware/smackx/workgroup/packet/DepartQueuePacket.java
similarity index 100%
rename from source/org/jivesoftware/smackx/workgroup/packet/DepartQueuePacket.java
rename to workgroup/source/org/jivesoftware/smackx/workgroup/packet/DepartQueuePacket.java
diff --git a/source/org/jivesoftware/smackx/workgroup/packet/MetaDataProvider.java b/workgroup/source/org/jivesoftware/smackx/workgroup/packet/MetaDataProvider.java
similarity index 100%
rename from source/org/jivesoftware/smackx/workgroup/packet/MetaDataProvider.java
rename to workgroup/source/org/jivesoftware/smackx/workgroup/packet/MetaDataProvider.java
diff --git a/source/org/jivesoftware/smackx/workgroup/packet/MonitorPacket.java b/workgroup/source/org/jivesoftware/smackx/workgroup/packet/MonitorPacket.java
similarity index 100%
rename from source/org/jivesoftware/smackx/workgroup/packet/MonitorPacket.java
rename to workgroup/source/org/jivesoftware/smackx/workgroup/packet/MonitorPacket.java
diff --git a/source/org/jivesoftware/smackx/workgroup/packet/OccupantsInfo.java b/workgroup/source/org/jivesoftware/smackx/workgroup/packet/OccupantsInfo.java
similarity index 100%
rename from source/org/jivesoftware/smackx/workgroup/packet/OccupantsInfo.java
rename to workgroup/source/org/jivesoftware/smackx/workgroup/packet/OccupantsInfo.java
diff --git a/source/org/jivesoftware/smackx/workgroup/packet/OfferRequestProvider.java b/workgroup/source/org/jivesoftware/smackx/workgroup/packet/OfferRequestProvider.java
similarity index 100%
rename from source/org/jivesoftware/smackx/workgroup/packet/OfferRequestProvider.java
rename to workgroup/source/org/jivesoftware/smackx/workgroup/packet/OfferRequestProvider.java
diff --git a/source/org/jivesoftware/smackx/workgroup/packet/OfferRevokeProvider.java b/workgroup/source/org/jivesoftware/smackx/workgroup/packet/OfferRevokeProvider.java
similarity index 100%
rename from source/org/jivesoftware/smackx/workgroup/packet/OfferRevokeProvider.java
rename to workgroup/source/org/jivesoftware/smackx/workgroup/packet/OfferRevokeProvider.java
diff --git a/source/org/jivesoftware/smackx/workgroup/packet/QueueDetails.java b/workgroup/source/org/jivesoftware/smackx/workgroup/packet/QueueDetails.java
similarity index 100%
rename from source/org/jivesoftware/smackx/workgroup/packet/QueueDetails.java
rename to workgroup/source/org/jivesoftware/smackx/workgroup/packet/QueueDetails.java
diff --git a/source/org/jivesoftware/smackx/workgroup/packet/QueueOverview.java b/workgroup/source/org/jivesoftware/smackx/workgroup/packet/QueueOverview.java
similarity index 100%
rename from source/org/jivesoftware/smackx/workgroup/packet/QueueOverview.java
rename to workgroup/source/org/jivesoftware/smackx/workgroup/packet/QueueOverview.java
diff --git a/source/org/jivesoftware/smackx/workgroup/packet/QueueUpdate.java b/workgroup/source/org/jivesoftware/smackx/workgroup/packet/QueueUpdate.java
similarity index 100%
rename from source/org/jivesoftware/smackx/workgroup/packet/QueueUpdate.java
rename to workgroup/source/org/jivesoftware/smackx/workgroup/packet/QueueUpdate.java
diff --git a/source/org/jivesoftware/smackx/workgroup/packet/RoomInvitation.java b/workgroup/source/org/jivesoftware/smackx/workgroup/packet/RoomInvitation.java
similarity index 100%
rename from source/org/jivesoftware/smackx/workgroup/packet/RoomInvitation.java
rename to workgroup/source/org/jivesoftware/smackx/workgroup/packet/RoomInvitation.java
diff --git a/source/org/jivesoftware/smackx/workgroup/packet/RoomTransfer.java b/workgroup/source/org/jivesoftware/smackx/workgroup/packet/RoomTransfer.java
similarity index 100%
rename from source/org/jivesoftware/smackx/workgroup/packet/RoomTransfer.java
rename to workgroup/source/org/jivesoftware/smackx/workgroup/packet/RoomTransfer.java
diff --git a/source/org/jivesoftware/smackx/workgroup/packet/SessionID.java b/workgroup/source/org/jivesoftware/smackx/workgroup/packet/SessionID.java
similarity index 100%
rename from source/org/jivesoftware/smackx/workgroup/packet/SessionID.java
rename to workgroup/source/org/jivesoftware/smackx/workgroup/packet/SessionID.java
diff --git a/source/org/jivesoftware/smackx/workgroup/packet/Transcript.java b/workgroup/source/org/jivesoftware/smackx/workgroup/packet/Transcript.java
similarity index 100%
rename from source/org/jivesoftware/smackx/workgroup/packet/Transcript.java
rename to workgroup/source/org/jivesoftware/smackx/workgroup/packet/Transcript.java
diff --git a/source/org/jivesoftware/smackx/workgroup/packet/TranscriptProvider.java b/workgroup/source/org/jivesoftware/smackx/workgroup/packet/TranscriptProvider.java
similarity index 100%
rename from source/org/jivesoftware/smackx/workgroup/packet/TranscriptProvider.java
rename to workgroup/source/org/jivesoftware/smackx/workgroup/packet/TranscriptProvider.java
diff --git a/source/org/jivesoftware/smackx/workgroup/packet/TranscriptSearch.java b/workgroup/source/org/jivesoftware/smackx/workgroup/packet/TranscriptSearch.java
similarity index 100%
rename from source/org/jivesoftware/smackx/workgroup/packet/TranscriptSearch.java
rename to workgroup/source/org/jivesoftware/smackx/workgroup/packet/TranscriptSearch.java
diff --git a/source/org/jivesoftware/smackx/workgroup/packet/Transcripts.java b/workgroup/source/org/jivesoftware/smackx/workgroup/packet/Transcripts.java
similarity index 100%
rename from source/org/jivesoftware/smackx/workgroup/packet/Transcripts.java
rename to workgroup/source/org/jivesoftware/smackx/workgroup/packet/Transcripts.java
diff --git a/source/org/jivesoftware/smackx/workgroup/packet/TranscriptsProvider.java b/workgroup/source/org/jivesoftware/smackx/workgroup/packet/TranscriptsProvider.java
similarity index 100%
rename from source/org/jivesoftware/smackx/workgroup/packet/TranscriptsProvider.java
rename to workgroup/source/org/jivesoftware/smackx/workgroup/packet/TranscriptsProvider.java
diff --git a/source/org/jivesoftware/smackx/workgroup/packet/UserID.java b/workgroup/source/org/jivesoftware/smackx/workgroup/packet/UserID.java
similarity index 100%
rename from source/org/jivesoftware/smackx/workgroup/packet/UserID.java
rename to workgroup/source/org/jivesoftware/smackx/workgroup/packet/UserID.java
diff --git a/source/org/jivesoftware/smackx/workgroup/packet/WorkgroupInformation.java b/workgroup/source/org/jivesoftware/smackx/workgroup/packet/WorkgroupInformation.java
similarity index 100%
rename from source/org/jivesoftware/smackx/workgroup/packet/WorkgroupInformation.java
rename to workgroup/source/org/jivesoftware/smackx/workgroup/packet/WorkgroupInformation.java
diff --git a/source/org/jivesoftware/smackx/workgroup/settings/ChatSetting.java b/workgroup/source/org/jivesoftware/smackx/workgroup/settings/ChatSetting.java
similarity index 100%
rename from source/org/jivesoftware/smackx/workgroup/settings/ChatSetting.java
rename to workgroup/source/org/jivesoftware/smackx/workgroup/settings/ChatSetting.java
diff --git a/source/org/jivesoftware/smackx/workgroup/settings/ChatSettings.java b/workgroup/source/org/jivesoftware/smackx/workgroup/settings/ChatSettings.java
similarity index 100%
rename from source/org/jivesoftware/smackx/workgroup/settings/ChatSettings.java
rename to workgroup/source/org/jivesoftware/smackx/workgroup/settings/ChatSettings.java
diff --git a/source/org/jivesoftware/smackx/workgroup/settings/GenericSettings.java b/workgroup/source/org/jivesoftware/smackx/workgroup/settings/GenericSettings.java
similarity index 100%
rename from source/org/jivesoftware/smackx/workgroup/settings/GenericSettings.java
rename to workgroup/source/org/jivesoftware/smackx/workgroup/settings/GenericSettings.java
diff --git a/source/org/jivesoftware/smackx/workgroup/settings/OfflineSettings.java b/workgroup/source/org/jivesoftware/smackx/workgroup/settings/OfflineSettings.java
similarity index 100%
rename from source/org/jivesoftware/smackx/workgroup/settings/OfflineSettings.java
rename to workgroup/source/org/jivesoftware/smackx/workgroup/settings/OfflineSettings.java
diff --git a/source/org/jivesoftware/smackx/workgroup/settings/SearchSettings.java b/workgroup/source/org/jivesoftware/smackx/workgroup/settings/SearchSettings.java
similarity index 100%
rename from source/org/jivesoftware/smackx/workgroup/settings/SearchSettings.java
rename to workgroup/source/org/jivesoftware/smackx/workgroup/settings/SearchSettings.java
diff --git a/source/org/jivesoftware/smackx/workgroup/settings/SoundSettings.java b/workgroup/source/org/jivesoftware/smackx/workgroup/settings/SoundSettings.java
similarity index 100%
rename from source/org/jivesoftware/smackx/workgroup/settings/SoundSettings.java
rename to workgroup/source/org/jivesoftware/smackx/workgroup/settings/SoundSettings.java
diff --git a/source/org/jivesoftware/smackx/workgroup/settings/WorkgroupProperties.java b/workgroup/source/org/jivesoftware/smackx/workgroup/settings/WorkgroupProperties.java
similarity index 100%
rename from source/org/jivesoftware/smackx/workgroup/settings/WorkgroupProperties.java
rename to workgroup/source/org/jivesoftware/smackx/workgroup/settings/WorkgroupProperties.java
diff --git a/source/org/jivesoftware/smackx/workgroup/user/QueueListener.java b/workgroup/source/org/jivesoftware/smackx/workgroup/user/QueueListener.java
similarity index 100%
rename from source/org/jivesoftware/smackx/workgroup/user/QueueListener.java
rename to workgroup/source/org/jivesoftware/smackx/workgroup/user/QueueListener.java
diff --git a/source/org/jivesoftware/smackx/workgroup/user/Workgroup.java b/workgroup/source/org/jivesoftware/smackx/workgroup/user/Workgroup.java
similarity index 100%
rename from source/org/jivesoftware/smackx/workgroup/user/Workgroup.java
rename to workgroup/source/org/jivesoftware/smackx/workgroup/user/Workgroup.java
diff --git a/source/org/jivesoftware/smackx/workgroup/util/ListenerEventDispatcher.java b/workgroup/source/org/jivesoftware/smackx/workgroup/util/ListenerEventDispatcher.java
similarity index 100%
rename from source/org/jivesoftware/smackx/workgroup/util/ListenerEventDispatcher.java
rename to workgroup/source/org/jivesoftware/smackx/workgroup/util/ListenerEventDispatcher.java
diff --git a/source/org/jivesoftware/smackx/workgroup/util/MetaDataUtils.java b/workgroup/source/org/jivesoftware/smackx/workgroup/util/MetaDataUtils.java
similarity index 100%
rename from source/org/jivesoftware/smackx/workgroup/util/MetaDataUtils.java
rename to workgroup/source/org/jivesoftware/smackx/workgroup/util/MetaDataUtils.java
diff --git a/source/org/jivesoftware/smackx/workgroup/util/ModelUtil.java b/workgroup/source/org/jivesoftware/smackx/workgroup/util/ModelUtil.java
similarity index 100%
rename from source/org/jivesoftware/smackx/workgroup/util/ModelUtil.java
rename to workgroup/source/org/jivesoftware/smackx/workgroup/util/ModelUtil.java