diff --git a/eclipse-formatting.xml b/eclipse-formatting.xml
new file mode 100644
index 000000000..d2776ff89
--- /dev/null
+++ b/eclipse-formatting.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<profiles version="2">
+<profile kind="CleanUpProfile" name="jargon" version="2">
+<setting id="cleanup.remove_unused_private_fields" value="true"/>
+<setting id="cleanup.always_use_parentheses_in_expressions" value="false"/>
+<setting id="cleanup.never_use_blocks" value="false"/>
+<setting id="cleanup.remove_unused_private_methods" value="true"/>
+<setting id="cleanup.add_missing_deprecated_annotations" value="true"/>
+<setting id="cleanup.convert_to_enhanced_for_loop" value="true"/>
+<setting id="cleanup.remove_unnecessary_nls_tags" value="true"/>
+<setting id="cleanup.sort_members" value="false"/>
+<setting id="cleanup.remove_unused_local_variables" value="true"/>
+<setting id="cleanup.never_use_parentheses_in_expressions" value="true"/>
+<setting id="cleanup.remove_unused_private_members" value="false"/>
+<setting id="cleanup.remove_unnecessary_casts" value="true"/>
+<setting id="cleanup.make_parameters_final" value="true"/>
+<setting id="cleanup.use_this_for_non_static_field_access" value="true"/>
+<setting id="cleanup.remove_private_constructors" value="true"/>
+<setting id="cleanup.use_blocks" value="true"/>
+<setting id="cleanup.always_use_this_for_non_static_method_access" value="false"/>
+<setting id="cleanup.remove_trailing_whitespaces_all" value="true"/>
+<setting id="cleanup.always_use_this_for_non_static_field_access" value="false"/>
+<setting id="cleanup.use_this_for_non_static_field_access_only_if_necessary" value="true"/>
+<setting id="cleanup.add_default_serial_version_id" value="false"/>
+<setting id="cleanup.make_type_abstract_if_missing_method" value="false"/>
+<setting id="cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class" value="true"/>
+<setting id="cleanup.make_variable_declarations_final" value="true"/>
+<setting id="cleanup.add_missing_nls_tags" value="false"/>
+<setting id="cleanup.format_source_code" value="true"/>
+<setting id="cleanup.qualify_static_method_accesses_with_declaring_class" value="false"/>
+<setting id="cleanup.add_missing_override_annotations" value="true"/>
+<setting id="cleanup.remove_unused_private_types" value="true"/>
+<setting id="cleanup.add_missing_methods" value="false"/>
+<setting id="cleanup.make_local_variable_final" value="false"/>
+<setting id="cleanup.correct_indentation" value="true"/>
+<setting id="cleanup.add_missing_override_annotations_interface_methods" value="true"/>
+<setting id="cleanup.remove_unused_imports" value="true"/>
+<setting id="cleanup.remove_trailing_whitespaces_ignore_empty" value="false"/>
+<setting id="cleanup.make_private_fields_final" value="false"/>
+<setting id="cleanup.add_generated_serial_version_id" value="true"/>
+<setting id="cleanup.organize_imports" value="true"/>
+<setting id="cleanup.remove_trailing_whitespaces" value="true"/>
+<setting id="cleanup.sort_members_all" value="false"/>
+<setting id="cleanup.use_blocks_only_for_return_and_throw" value="false"/>
+<setting id="cleanup.add_missing_annotations" value="true"/>
+<setting id="cleanup.use_parentheses_in_expressions" value="false"/>
+<setting id="cleanup.qualify_static_field_accesses_with_declaring_class" value="false"/>
+<setting id="cleanup.use_this_for_non_static_method_access_only_if_necessary" value="true"/>
+<setting id="cleanup.use_this_for_non_static_method_access" value="true"/>
+<setting id="cleanup.qualify_static_member_accesses_through_instances_with_declaring_class" value="true"/>
+<setting id="cleanup.add_serial_version_id" value="true"/>
+<setting id="cleanup.format_source_code_changes_only" value="false"/>
+<setting id="cleanup.qualify_static_member_accesses_with_declaring_class" value="true"/>
+<setting id="cleanup.always_use_blocks" value="true"/>
+</profile>
+</profiles>
diff --git a/src/emc-metalnx-core/pom.xml b/src/emc-metalnx-core/pom.xml
index 1dff003c2..4008b5b15 100755
--- a/src/emc-metalnx-core/pom.xml
+++ b/src/emc-metalnx-core/pom.xml
@@ -18,6 +18,10 @@
 	</parent>
 	<artifactId>emc-metalnx-core</artifactId>
 	<dependencies>
+		<dependency>
+			<groupId>org.irods.jargon</groupId>
+			<artifactId>jargon-core</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>javassist</groupId>
 			<artifactId>javassist</artifactId>
@@ -83,23 +87,24 @@
 
 	<build>
 		<plugins>
-             <!-- Plugin required to build java classes from XSD using XJC -->
-             <plugin>
-                 <groupId>org.codehaus.mojo</groupId>
-                 <artifactId>jaxb2-maven-plugin</artifactId>
-                 <version>1.5</version>
-                 <executions>
-                     <execution>
-                         <goals>
-                             <goal>xjc</goal>
-                         </goals>
-                     </execution>
-                 </executions>
-                 <configuration>
-                    <!-- The name of your generated source package -->
-                     <arguments>-extension -npa -b "${project.basedir}/src/main/xsd/global.xjb"</arguments> 
-                 </configuration>
-             </plugin>
+			<!-- Plugin required to build java classes from XSD using XJC -->
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>jaxb2-maven-plugin</artifactId>
+				<version>1.5</version>
+				<executions>
+					<execution>
+						<goals>
+							<goal>xjc</goal>
+						</goals>
+					</execution>
+				</executions>
+				<configuration>
+					<!-- The name of your generated source package -->
+					<arguments>-extension -npa -b
+						"${project.basedir}/src/main/xsd/global.xjb"</arguments>
+				</configuration>
+			</plugin>
 			<plugin>
 				<artifactId>maven-antrun-plugin</artifactId>
 				<executions>
@@ -191,51 +196,51 @@
 									irods.admin.user=${jargon.test.irods.admin}
 									irods.admin.password=${jargon.test.irods.admin.password}
 
-									
+
 									irods.auth.scheme=${metalnx.auth.scheme}
 									default.storage.resource=${jargon.test.irods.resource}
 									ssl.negotiation.policy=${metalnx.ssl.policy}
 
 									##########################################################
-								
+
 									utilize.packing.streams=${metalnx.packing.streams}
 
-								
+
 									compute.checksum=${metalnx.compute.checksum}
 
 									##########################################################
-									
+
 									db.driverClassName=${metalnx.jdbc.driver}
 									db.url=${metalnx.jdbc.url}
 									db.username=${metalnx.jdbc.user}
 									db.password=${metalnx.jdbc.password}
 									hibernate.dialect=${metalnx.jdbc.dialect}
 
-									
+
 									hibernate.show_sql=true
 									hibernate.format_sql=false
 
-									
+
 									hibernate.hbm2ddl.auto=update
 
-									
+
 									connection.pool_size=5
 
 									######################################
-									
+
 									jobs.irods.username=${jargon.test.irods.admin}
 									jobs.irods.password=${jargon.test.irods.admin.password}
 									jobs.irods.auth.scheme=${metalnx.auth.scheme}
 									runSyncJobs=true
 
-									
+
 									rmd.connection.timeout=500
 									rmd.connection.port=8000
 
 									reverse.dns.lookup=false
 
 									######################################
-									
+
 									populate.msi.enabled=false
 									illumina.msi.enabled=true
 
@@ -248,7 +253,7 @@
 									msi.irods.42.list=libmsisync_to_archive.so,libmsi_update_unixfilesystem_resource_free_space.so
 
 									msi.other.list=
-									
+
 									resource.location.images=/images/,classpath:static/images/
 									resource.location.fonts=/fonts/,classpath:static/fonts/
 									resource.location.css=/css/,classpath:static/css/
@@ -265,7 +270,7 @@
 					</execution>
 				</executions>
 			</plugin>
-			
+
 
 		</plugins>
 	</build>
diff --git a/src/emc-metalnx-web/src/main/webapp/WEB-INF/applicationContext.xml b/src/emc-metalnx-web/src/main/webapp/WEB-INF/applicationContext.xml
index 50c59ebbe..9e3853272 100755
--- a/src/emc-metalnx-web/src/main/webapp/WEB-INF/applicationContext.xml
+++ b/src/emc-metalnx-web/src/main/webapp/WEB-INF/applicationContext.xml
@@ -24,8 +24,8 @@
 		<property name="locations">
 			<list>
 
-				<!--<value>file:/etc/irods-ext/metalnx.properties</value> -->
-				<value>file:///C:/opt/etc/irods-ext/metalnx.properties</value>
+				<value>file:/etc/irods-ext/metalnx.properties</value> 
+				<!--  <value>file:///C:/opt/etc/irods-ext/metalnx.properties</value>  -->
 
 			</list>
 		</property>
@@ -34,8 +34,8 @@
 
 	<!-- this resource must be in the /etc/irods-ext directory, see the CONFIGURATION.md
 		doc at the top of the repo, It allows theming and custom messages -->
-
-	<import resource="file:///C:/opt/etc/irods-ext/metalnxConfig.xml" />
+<import resource="file:/etc/irods-ext/metalnxConfig.xml" />
+	<!--   <import resource="file:///C:/opt/etc/irods-ext/metalnxConfig.xml" /> -->
 	<!-- <import resource="file:/etc/irods-ext/metalnxConfig.xml" /> -->
 	<!-- **************************************************************** -->
 	<!-- SPRING SECURITY-SPECIFIC ARTIFACTS -->