diff --git a/pom.xml b/pom.xml
index 9c4867186ae42d6535a756777b54852a8932a0b6..2c451763612e39d2a58a7bfee143bc46ed7cb36c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,6 +21,7 @@
 	<build>
 		<plugins>
 			<plugin>
+                <groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
 				<version>3.0</version>
 				<configuration>
@@ -48,6 +49,10 @@
 					</execution>
 				</executions>
 			</plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-assembly-plugin</artifactId>
+            </plugin>
 		</plugins>
 		<pluginManagement>
 			<plugins>
@@ -83,6 +88,38 @@
 						</lifecycleMappingMetadata>
 					</configuration>
 				</plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <version>2.5</version>
+                    <artifactId>maven-assembly-plugin</artifactId>
+                    <configuration>
+                        <descriptorRefs>
+                            <descriptorRef>jar-with-dependencies</descriptorRef>
+                        </descriptorRefs>
+                        <archive>     
+                            <manifestEntries>
+                                <Class-Path>.</Class-Path>
+                            </manifestEntries>
+                            <manifest>
+                                <!-- <addClasspath>true</addClasspath>
+                                <classpathPrefix>../lib/</classpathPrefix> -->
+                                <mainClass>net.floodlightcontroller.core.Main</mainClass>
+                                <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+                                <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+                            </manifest>
+                        </archive>
+                        <appendAssemblyId>false</appendAssemblyId>
+                        <finalName>floodlight</finalName>
+                    </configuration>
+                    <executions>
+                        <execution>
+                            <phase>package</phase>
+                            <goals>
+                                <goal>single</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                </plugin>
 			</plugins>
 		</pluginManagement>
 		<resources>
@@ -92,8 +129,14 @@
 					<include>LICENSE.txt</include>
 					<include>NOTICE.txt</include>
 					<include>README.md</include>
-				</includes>
+                </includes>
+            </resource>
+            <resource>
+                <directory>src/main/resources</directory>
 			</resource>
+            <resource>
+                <directory>src/test/resources</directory>
+            </resource>
 		</resources>
 	</build>
 	<dependencies>
diff --git a/src/main/resources/logback-test.xml b/src/main/resources/logback-test.xml
deleted file mode 100644
index e4baf8bcf2d7714750c45adc6ad8298ad9e2f49b..0000000000000000000000000000000000000000
--- a/src/main/resources/logback-test.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<configuration scan="true">
-  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-    <encoder>
-      <pattern>%d{HH:mm:ss.SSS} %level [%logger{20}:%thread] %msg%n</pattern>
-    </encoder>
-  </appender>
-  <root level="DEBUG">
-    <appender-ref ref="STDOUT" />
-    <appender-ref ref="EV_WARN_ERR" />
-  </root>
-  <logger name="org" level="INFO"/>
-  <logger name="io" level="INFO"></logger> <!-- Netty logging -->
-  <logger name="LogService" level="DEBUG"></logger> <!-- Restlet access logging -->
-  <logger name="net.floodlightcontroller" level="INFO"/>
-  <logger name="org.sdnplatform" level="INFO"></logger>
-  <logger name="org.sdnplatform.sync.internal.SyncManager" level="INFO"></logger>
-  <logger name="org.sdnplatform.sync.internal.config.StorageCCProvider" level="INFO"></logger>
-  <logger name="org.sdnplatform.sync.internal.config.PropertyCCProvider" level="INFO"></logger>
-  <logger name="org.sdnplatform.sync.internal.rpc.RPCService" level="INFO"></logger>
-  <logger name="net.floodlightcontroller.devicemanager.DeviceManagerImpl" level="INFO"></logger>
-  <logger name="net.floodlightcontroller.linkdiscovery" level="INFO"></logger>
-  <logger name="net.floodlightcontroller.forwarding.Forwarding" level="INFO"></logger>
-  <logger name="net.floodlightcontroller.forwarding.ForwardingBase" level="INFO"></logger>
-  <logger name="net.floodlightcontroller.core" level="INFO"></logger>
-  <logger name="net.floodlightcontroller.topology" level="INFO" ></logger>
-  <logger name="org.projectfloodlight.openflow" level="INFO" ></logger>
-  <logger name="net.floodlightcontroller.core.internal.OFSwitchManager" level="INFO"></logger>
-  <logger name="net.floodlightcontroller.core.internal.OFSwitchHandshakeHandler" level="INFO"></logger>
-  <logger name="net.floodlightcontroller.core.internal.OFChannelHandler" level="INFO"></logger>
-  <logger name="net.floodlightcontroller.staticentry.StaticEntries" level="INFO"></logger>
-  <logger name="net.floodlightcontroller.staticentry.StaticEntryPusher" level="INFO"></logger>
-  
-  <logger name="net.floodlightcontroller.simpleft.FT" level="INFO"></logger>
-  
-
-</configuration>
diff --git a/logback.xml b/src/main/resources/logback.xml
similarity index 88%
rename from logback.xml
rename to src/main/resources/logback.xml
index 046352aebf359b9da910aac0983e8448ab404ed1..c06395b089987f4d9415bf1dca02ca91de092af1 100644
--- a/logback.xml
+++ b/src/main/resources/logback.xml
@@ -8,7 +8,7 @@
     <appender-ref ref="STDOUT" />
   </root>
   <logger name="io" level="INFO"></logger> <!-- Netty logging -->
-  <logger name="LogService" level="INFO"/> <!-- Restlet access logging -->
+  <logger name="LogService" level="WARN"/> <!-- Restlet access logging -->
   <logger name="net.floodlightcontroller" level="INFO"/>
   <logger name="org.sdnplatform" level="INFO"/>
 </configuration>
diff --git a/src/test/resources/logback.xml b/src/test/resources/logback.xml
new file mode 100644
index 0000000000000000000000000000000000000000..5af015b46d49c82867531c5b9febbd24aea96cab
--- /dev/null
+++ b/src/test/resources/logback.xml
@@ -0,0 +1,14 @@
+<configuration scan="true">
+  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+    <encoder>
+      <pattern>%date{yyyy-MM-dd HH:mm:ss.S} %-5level [%logger{15}] %msg%n</pattern>
+    </encoder>
+  </appender>
+  <root level="INFO">
+    <appender-ref ref="STDOUT" />
+  </root>
+  <logger name="io" level="ERROR"></logger> <!-- Netty logging -->
+  <logger name="LogService" level="ERROR"/> <!-- Restlet access logging -->
+  <logger name="net.floodlightcontroller" level="ERROR"/>
+  <logger name="org.sdnplatform" level="ERROR"/>
+</configuration>