diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000..565b81f
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,40 @@
+<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>com.mcplusa.google</groupId>
+  <artifactId>mcplusa-google-feeder-java</artifactId>
+  <version>1.0.0</version>
+  <packaging>jar</packaging>
+
+  <name>mcplusa-google-feeder-java</name>
+  <url>http://maven.apache.org</url>
+
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>3.8.1</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+		<groupId>log4j</groupId>
+		<artifactId>log4j</artifactId>
+		<version>1.2.17</version>
+	</dependency>
+	<dependency>
+		<groupId>xerces</groupId>
+		<artifactId>xercesImpl</artifactId>
+		<version>2.8.0</version>
+	</dependency>
+	<dependency>
+		<groupId>commons-httpclient</groupId>
+		<artifactId>commons-httpclient</artifactId>
+		<version>3.1</version>
+	</dependency>
+  </dependencies>
+</project>
diff --git a/src/com/mcplusa/google/feeder/FeederUtil.java b/src/com/mcplusa/google/feeder/FeederUtil.java
index 1cf4d67..2fee1f7 100644
--- a/src/com/mcplusa/google/feeder/FeederUtil.java
+++ b/src/com/mcplusa/google/feeder/FeederUtil.java
@@ -1,8 +1,3 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
-
 package com.mcplusa.google.feeder;
 
 import java.io.*;
diff --git a/src/com/mcplusa/google/feeder/GSAContentItem.java b/src/com/mcplusa/google/feeder/GSAContentItem.java
index bc85c13..5e613c6 100644
--- a/src/com/mcplusa/google/feeder/GSAContentItem.java
+++ b/src/com/mcplusa/google/feeder/GSAContentItem.java
@@ -1,8 +1,3 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
-
 package com.mcplusa.google.feeder;
 
 import java.util.*;
diff --git a/src/com/mcplusa/google/feeder/GSAFeed.java b/src/com/mcplusa/google/feeder/GSAFeed.java
index 1d300d2..64f8103 100644
--- a/src/com/mcplusa/google/feeder/GSAFeed.java
+++ b/src/com/mcplusa/google/feeder/GSAFeed.java
@@ -1,7 +1,3 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
 package com.mcplusa.google.feeder;
 
 import java.io.IOException;
@@ -99,13 +95,12 @@ public void BuildHeader() throws SAXException, IOException {
 
     public final String WriteXMLToFile(String gsa) {
         logger.info("Starting WriteXmlToFile");
-        String filename = "asdf" + "something";
         Date now = new Date();
         SimpleDateFormat sd = new SimpleDateFormat("yyyy_mm_dd_hh_ss");
         
         String timestamp = sd.format(now);
         
-        filename = this.dataSource + "_" +  timestamp + ".xml";
+        String filename = this.dataSource + "_" +  timestamp + ".xml";
         try {
         	if (feederFolder.length() > 0) {
         		if (feederFolder.endsWith("\\")) {
diff --git a/src/com/mcplusa/google/feeder/GSAMetaDataItem.java b/src/com/mcplusa/google/feeder/GSAMetaDataItem.java
index fd1707d..68e5515 100644
--- a/src/com/mcplusa/google/feeder/GSAMetaDataItem.java
+++ b/src/com/mcplusa/google/feeder/GSAMetaDataItem.java
@@ -1,8 +1,3 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
-
 package com.mcplusa.google.feeder;
 
 /**
diff --git a/src/com/mcplusa/google/feeder/constants/ConnectorConstants.java b/src/com/mcplusa/google/feeder/constants/ConnectorConstants.java
index d6d5b44..4ffe0db 100644
--- a/src/com/mcplusa/google/feeder/constants/ConnectorConstants.java
+++ b/src/com/mcplusa/google/feeder/constants/ConnectorConstants.java
@@ -1,8 +1,3 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
-
 package com.mcplusa.google.feeder.constants;
 
 /**
@@ -12,41 +7,26 @@
 public class ConnectorConstants {
   // mime
   public final static String MIME_TYPE = "mimetype";
-
   public final static String MIME_TEXT = "text/plain";
 
   // feeder
   public final static String FEEDER_LAST_MODIFIED = "last-modified";
-
   public final static String FEEDER_NAME = "name";
-
   public final static String FEEDER_CONTENT = "content";
-
   public final static String FEEDER_METADATA = "metadata";
-
   public final static String FEEDER_META = "meta";
-
   public final static String FEEDER_URL = "url";
-
   public final static String FEEDER_HEADER = "header";
-
   public final static String FEEDER_RECORD = "record";
-
   public final static String FEEDER_GROUP = "group";
-
   public final static String FEEDER_GSAFEED = "gsafeed";
-
   public final static String FEEDER_TYPE = "feedtype";
-
   public final static String FEEDER_DATA = "data";
-
   public final static String FEEDER_DS = "datasource";
 
   // feed types
   public final static String FEEDER_TYPE_FULL = "full";
-
   public final static String FEEDER_TYPE_INC = "incremental";
-
   public final static String FEEDER_TYPE_URL = "metadata-and-url";
 
   // authentication
@@ -68,10 +48,7 @@ public class ConnectorConstants {
   public static String TAG_ID = "ID";
   public static String TAG_MODIFIED = "Modified";
   public static String TAG_URL = "ServerUrl";
-  //
-  public static String SP_NAMESPACE = "http://schemas.microsoft.com/sharepoint/soap/";
-  public static String SP_PREFIX = "SOAPSDK9";
-  public static String SiteDirectoryTag = "SiteDirectory";
+  
   // feeder
   public final static String FEEDER_GATE = ":19900/xmlfeed";
 
diff --git a/src/com/mcplusa/google/feeder/constants/GSAAuthMethodTypes.java b/src/com/mcplusa/google/feeder/constants/GSAAuthMethodTypes.java
index 193d04a..77e440c 100644
--- a/src/com/mcplusa/google/feeder/constants/GSAAuthMethodTypes.java
+++ b/src/com/mcplusa/google/feeder/constants/GSAAuthMethodTypes.java
@@ -1,8 +1,3 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
-
 package com.mcplusa.google.feeder.constants;
 
 /**
diff --git a/src/com/mcplusa/google/feeder/constants/GSAFeedType.java b/src/com/mcplusa/google/feeder/constants/GSAFeedType.java
index e9831dd..8e0138a 100644
--- a/src/com/mcplusa/google/feeder/constants/GSAFeedType.java
+++ b/src/com/mcplusa/google/feeder/constants/GSAFeedType.java
@@ -1,8 +1,3 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
-
 package com.mcplusa.google.feeder.constants;
 
 /**
diff --git a/src/com/mcplusa/google/feeder/constants/GSAMimeTypes.java b/src/com/mcplusa/google/feeder/constants/GSAMimeTypes.java
index b4f76e5..24de709 100644
--- a/src/com/mcplusa/google/feeder/constants/GSAMimeTypes.java
+++ b/src/com/mcplusa/google/feeder/constants/GSAMimeTypes.java
@@ -1,8 +1,3 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
-
 package com.mcplusa.google.feeder.constants;
 
 /**
diff --git a/src/com/mcplusa/google/feeder/uploader/GSAUploader.java b/src/com/mcplusa/google/feeder/uploader/GSAUploader.java
index 944cc37..cb38b61 100644
--- a/src/com/mcplusa/google/feeder/uploader/GSAUploader.java
+++ b/src/com/mcplusa/google/feeder/uploader/GSAUploader.java
@@ -1,8 +1,3 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
-
 package com.mcplusa.google.feeder.uploader;
 
 import com.mcplusa.google.feeder.constants.*;
diff --git a/src/com/mcplusa/google/feeder/util/Base64.java b/src/com/mcplusa/google/feeder/util/Base64.java
index 02866f4..586e517 100644
--- a/src/com/mcplusa/google/feeder/util/Base64.java
+++ b/src/com/mcplusa/google/feeder/util/Base64.java
@@ -1,8 +1,3 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
-
 package com.mcplusa.google.feeder.util;
 
 /**