diff --git a/activemq-optional/project.properties b/activemq-optional/project.properties
index f9e42ed3f3..5380346053 100755
--- a/activemq-optional/project.properties
+++ b/activemq-optional/project.properties
@@ -2,4 +2,4 @@
 # Build Properties
 # -------------------------------------------------------------------
 maven.multiproject.type=jar
-maven.eclipse.classpath.include=${basedir}/src/conf
+maven.eclipse.classpath.include=${basedir}/src/main/resources
diff --git a/activemq-optional/src/conf/META-INF/services/org.apache.axis.components.jms.JMSVendorAdapter b/activemq-optional/src/conf/META-INF/services/org.apache.axis.components.jms.JMSVendorAdapter
deleted file mode 100755
index ecbfc3a473..0000000000
--- a/activemq-optional/src/conf/META-INF/services/org.apache.axis.components.jms.JMSVendorAdapter
+++ /dev/null
@@ -1 +0,0 @@
-org.apache.activemq.axis.ActiveMQVendorAdapter
diff --git a/activemq-optional/src/conf/META-INF/services/org/apache/activemq/transport/http b/activemq-optional/src/conf/META-INF/services/org/apache/activemq/transport/http
deleted file mode 100755
index b987887739..0000000000
--- a/activemq-optional/src/conf/META-INF/services/org/apache/activemq/transport/http
+++ /dev/null
@@ -1 +0,0 @@
-class=org.apache.activemq.transport.http.HttpTransportFactory
\ No newline at end of file
diff --git a/activemq-optional/src/conf/META-INF/services/org/apache/activemq/transport/jrms b/activemq-optional/src/conf/META-INF/services/org/apache/activemq/transport/jrms
deleted file mode 100755
index c363bb74c4..0000000000
--- a/activemq-optional/src/conf/META-INF/services/org/apache/activemq/transport/jrms
+++ /dev/null
@@ -1 +0,0 @@
-class=org.apache.activemq.transport.jrms.JRMSTransportChannelFactory
\ No newline at end of file
diff --git a/activemq-optional/src/conf/META-INF/services/org/apache/activemq/transport/ssl b/activemq-optional/src/conf/META-INF/services/org/apache/activemq/transport/ssl
deleted file mode 100755
index e11ec14c76..0000000000
--- a/activemq-optional/src/conf/META-INF/services/org/apache/activemq/transport/ssl
+++ /dev/null
@@ -1 +0,0 @@
-class=org.apache.activemq.transport.ssl.SslTransportChannelFactory
\ No newline at end of file
diff --git a/activemq-optional/src/main/resources/META-INF/services/org/activemq/wireformat/xstream b/activemq-optional/src/main/resources/META-INF/services/org/activemq/wireformat/xstream
deleted file mode 100644
index 4535ed6a98..0000000000
--- a/activemq-optional/src/main/resources/META-INF/services/org/activemq/wireformat/xstream
+++ /dev/null
@@ -1 +0,0 @@
-class=org.apache.activemq.transport.xstream.XStreamWireFormatFactory
\ No newline at end of file
diff --git a/activemq-optional/src/main/resources/META-INF/services/org/activemq/transport/http b/activemq-optional/src/main/resources/META-INF/services/org/apache/activemq/transport/http
similarity index 100%
rename from activemq-optional/src/main/resources/META-INF/services/org/activemq/transport/http
rename to activemq-optional/src/main/resources/META-INF/services/org/apache/activemq/transport/http
diff --git a/activemq-optional/src/main/resources/META-INF/services/org/activemq/transport/https b/activemq-optional/src/main/resources/META-INF/services/org/apache/activemq/transport/https
similarity index 100%
rename from activemq-optional/src/main/resources/META-INF/services/org/activemq/transport/https
rename to activemq-optional/src/main/resources/META-INF/services/org/apache/activemq/transport/https
diff --git a/activemq-optional/src/conf/META-INF/services/org/apache/activemq/wireformat/xstream b/activemq-optional/src/main/resources/META-INF/services/org/apache/activemq/wireformat/xstream
old mode 100755
new mode 100644
similarity index 100%
rename from activemq-optional/src/conf/META-INF/services/org/apache/activemq/wireformat/xstream
rename to activemq-optional/src/main/resources/META-INF/services/org/apache/activemq/wireformat/xstream