diff --git a/build.xml b/build.xml
index 9a00e49..f3aadae 100644
--- a/build.xml
+++ b/build.xml
@@ -1,4 +1,20 @@
-
+<!--
+~ Copyright (c) 2005-2010, WSO2 Inc. (http://wso2.com) All Rights Reserved.
+~
+~ WSO2 Inc. licenses this file to you under the Apache License,
+~ Version 2.0 (the "License"); you may not use this file except
+~ in compliance with the License.
+~ You may obtain a copy of the License at
+~
+~ http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing,
+~ software distributed under the License is distributed on an
+~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+~ KIND, either express or implied. See the License for the
+~ specific language governing permissions and limitations
+~ under the License.
+-->
 <project default="run">
     <property name="jmsUrl" value=""/>
     <property name="topicName" value=""/>
diff --git a/pathing.jar b/pathing.jar
index 09c4a30..9921d28 100644
Binary files a/pathing.jar and b/pathing.jar differ
diff --git a/pom.xml b/pom.xml
index 9b71cf0..08f66fc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,4 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+~ Copyright (c) 2005-2010, WSO2 Inc. (http://wso2.com) All Rights Reserved.
+~
+~ WSO2 Inc. licenses this file to you under the Apache License,
+~ Version 2.0 (the "License"); you may not use this file except
+~ in compliance with the License.
+~ You may obtain a copy of the License at
+~
+~ http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing,
+~ software distributed under the License is distributed on an
+~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+~ KIND, either express or implied. See the License for the
+~ specific language governing permissions and limitations
+~ under the License.
+-->
 <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">
@@ -31,17 +48,6 @@
             <artifactId>twitter4j-async</artifactId>
             <version>4.0.2</version>
         </dependency>
-        <dependency>
-            <groupId>org.junit</groupId>
-            <artifactId>org.junit</artifactId>
-            <version>3.8.1</version>
-        </dependency>
-        <dependency>
-            <groupId>org</groupId>
-            <artifactId>org.junit4</artifactId>
-            <version>4.8.1.v20120523-1257-wso2v1</version>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
     <build>
diff --git a/src/main/java/org/wso2/cep/uima/demo/StatusHandler.java b/src/main/java/org/wso2/cep/uima/demo/StatusHandler.java
index 4696cd5..f989b32 100644
--- a/src/main/java/org/wso2/cep/uima/demo/StatusHandler.java
+++ b/src/main/java/org/wso2/cep/uima/demo/StatusHandler.java
@@ -1,3 +1,23 @@
+/*
+ *
+ * Copyright (c) 2005-2010, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ * WSO2 Inc. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ * /
+ */
+
 package org.wso2.cep.uima.demo;
 
 import org.apache.activemq.ActiveMQConnectionFactory;
diff --git a/src/main/java/org/wso2/cep/uima/demo/TweetExtractor.java b/src/main/java/org/wso2/cep/uima/demo/TweetExtractor.java
index fcca647..dfb6924 100644
--- a/src/main/java/org/wso2/cep/uima/demo/TweetExtractor.java
+++ b/src/main/java/org/wso2/cep/uima/demo/TweetExtractor.java
@@ -1,3 +1,23 @@
+/*
+ *
+ * Copyright (c) 2005-2010, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ * WSO2 Inc. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ * /
+ */
+
 package org.wso2.cep.uima.demo;
 
 import org.apache.activemq.ActiveMQConnectionFactory;
@@ -107,8 +127,10 @@ private void retrieveTweets(int maxTweets){
         int index = 0;
         boolean maxValueReached = false;
 
+
         logger.info("Started Extracting Tweets of user: "+ userToSearch);
         // iterate through the timeline untill the iteration returns no tweets
+
         while (true) {
             try {
 
diff --git a/src/main/java/org/wso2/cep/uima/demo/TwitterStreamer.java b/src/main/java/org/wso2/cep/uima/demo/TwitterStreamer.java
index ddbbd8d..2f8bdd0 100644
--- a/src/main/java/org/wso2/cep/uima/demo/TwitterStreamer.java
+++ b/src/main/java/org/wso2/cep/uima/demo/TwitterStreamer.java
@@ -1,3 +1,23 @@
+/*
+ *
+ * Copyright (c) 2005-2010, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ * WSO2 Inc. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ * /
+ */
+
 package org.wso2.cep.uima.demo;
 
 import org.apache.log4j.PropertyConfigurator;
diff --git a/src/main/java/org/wso2/cep/uima/demo/Util/Tweet.java b/src/main/java/org/wso2/cep/uima/demo/Util/Tweet.java
index c9eab68..264af1a 100644
--- a/src/main/java/org/wso2/cep/uima/demo/Util/Tweet.java
+++ b/src/main/java/org/wso2/cep/uima/demo/Util/Tweet.java
@@ -1,3 +1,23 @@
+/*
+ *
+ * Copyright (c) 2005-2010, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ * WSO2 Inc. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ * /
+ */
+
 package org.wso2.cep.uima.demo.Util;
 
 import java.io.Serializable;
diff --git a/src/main/java/org/wso2/cep/uima/demo/Util/TwitterConfiguration.java b/src/main/java/org/wso2/cep/uima/demo/Util/TwitterConfiguration.java
index 743d168..6526236 100644
--- a/src/main/java/org/wso2/cep/uima/demo/Util/TwitterConfiguration.java
+++ b/src/main/java/org/wso2/cep/uima/demo/Util/TwitterConfiguration.java
@@ -1,3 +1,23 @@
+/*
+ *
+ * Copyright (c) 2005-2010, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ * WSO2 Inc. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ * /
+ */
+
 package org.wso2.cep.uima.demo.Util;
 
 /**
diff --git a/src/main/java/org/wso2/cep/uima/demo/Util/TwitterConfigurationBuilder.java b/src/main/java/org/wso2/cep/uima/demo/Util/TwitterConfigurationBuilder.java
index 57756ec..608c997 100644
--- a/src/main/java/org/wso2/cep/uima/demo/Util/TwitterConfigurationBuilder.java
+++ b/src/main/java/org/wso2/cep/uima/demo/Util/TwitterConfigurationBuilder.java
@@ -1,4 +1,24 @@
 
+/*
+ *
+ * Copyright (c) 2005-2010, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ * WSO2 Inc. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ * /
+ */
+
 package org.wso2.cep.uima.demo.Util;
 
 import org.apache.log4j.Logger;
diff --git a/twitterConfig.xml b/twitterConfig.xml
index 0edb5ec..9ae1dfc 100644
--- a/twitterConfig.xml
+++ b/twitterConfig.xml
@@ -1,4 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+~ Copyright (c) 2005-2010, WSO2 Inc. (http://wso2.com) All Rights Reserved.
+~
+~ WSO2 Inc. licenses this file to you under the Apache License,
+~ Version 2.0 (the "License"); you may not use this file except
+~ in compliance with the License.
+~ You may obtain a copy of the License at
+~
+~ http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing,
+~ software distributed under the License is distributed on an
+~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+~ KIND, either express or implied. See the License for the
+~ specific language governing permissions and limitations
+~ under the License.
+-->
 
 <TwitterConfiguration>