diff --git a/distribution/src/main/resources/bin/ingest b/distribution/src/main/resources/bin/ingest
old mode 100644
new mode 100755
index cb6ecb6..7633dea
--- a/distribution/src/main/resources/bin/ingest
+++ b/distribution/src/main/resources/bin/ingest
@@ -18,6 +18,9 @@ export DIR=`dirname $0`
 cd $DIR
 export DIR_PATH=`pwd`
 
+export FILEMGR_URL="http://localhost:9000"
+export OODT_HOME="/usr/local/coal-sds-deploy" 
+
 if [ "$#" -ne 1 ]; then
    echo "Usage: $0 <dir>"
    exit 1
@@ -30,4 +33,4 @@ else
     --productPath $1 \
     --metExtractor org.apache.oodt.cas.metadata.extractors.TikaCmdLineMetExtractor \
     --metExtractorConfig $OODT_HOME/data/met/tika.conf
-fi
\ No newline at end of file
+fi
diff --git a/filemgr/src/main/resources/etc/filemgr.properties b/filemgr/src/main/resources/etc/filemgr.properties
old mode 100644
new mode 100755
index 12c0eba..ffbc246
--- a/filemgr/src/main/resources/etc/filemgr.properties
+++ b/filemgr/src/main/resources/etc/filemgr.properties
@@ -18,8 +18,16 @@
 # repository factory
 filemgr.repository.factory=org.apache.oodt.cas.filemgr.repository.XMLRepositoryManagerFactory
 
-# Lucene catalog factory
-filemgr.catalog.factory=org.apache.oodt.cas.filemgr.catalog.LuceneCatalogFactory
+# RPC implementation, options include the deprecated XMLRPC or the preferred AvroRPC
+# uncomment the Avro implementations to use AvroRPC
+#filemgr.server=org.apache.oodt.cas.filemgr.system.rpc.XmlRpcFileManagerServerFactory
+#filemgr.client=org.apache.oodt.cas.filemgr.system.rpc.XmlRpcFileManagerClientFactory
+filemgr.server=org.apache.oodt.cas.filemgr.system.rpc.AvroFileManagerServerFactory
+filemgr.client=org.apache.oodt.cas.filemgr.system.rpc.AvroFileManagerClientFactory
+
+# Solr catalog factory
+filemgr.catalog.factory=org.apache.oodt.cas.filemgr.catalog.solr.SolrCatalogFactory
+org.apache.oodt.cas.filemgr.catalog.solr.url=http://localhost:8080/solr/oodt-fm
 
 # data transfer factory
 filemgr.datatransfer.factory=org.apache.oodt.cas.filemgr.datatransfer.LocalDataTransferFactory
@@ -37,23 +45,23 @@ org.apache.oodt.cas.filemgr.system.xmlrpc.requestTimeout.minutes=60
 #org.apache.oodt.cas.filemgr.catalog.mappeddatasource.mapFile=/path/to/ops.catalog.typemap.properties
 
 # lucene catalog configuration
-org.apache.oodt.cas.filemgr.catalog.lucene.idxPath=/usr/local/coal-sds-deploy/data/catalog
+org.apache.oodt.cas.filemgr.catalog.lucene.idxPath=/usr/local/coal-sds-deploy/filemgr/data/catalog
 org.apache.oodt.cas.filemgr.catalog.lucene.pageSize=20
 org.apache.oodt.cas.filemgr.catalog.lucene.commitLockTimeout.seconds=60
 org.apache.oodt.cas.filemgr.catalog.lucene.writeLockTimeout.seconds=60
 org.apache.oodt.cas.filemgr.catalog.lucene.mergeFactor=20
 
 # XML repository manager configuration
-org.apache.oodt.cas.filemgr.repositorymgr.dirs=file:///usr/local/coal-sds-deploy/policy/oodt
+org.apache.oodt.cas.filemgr.repositorymgr.dirs=file:///usr/local/coal-sds-deploy/filemgr/policy/oodt
 
 # XML validation layer configuration
-org.apache.oodt.cas.filemgr.validation.dirs=file:///usr/local/coal-sds-deploy/policy/oodt
+org.apache.oodt.cas.filemgr.validation.dirs=file:///usr/local/coal-sds-deploy/filemgr/policy/oodt
 
 # remote data transfer configuration
 org.apache.oodt.cas.filemgr.datatransfer.remote.chunkSize=1024
 
 # location of Mime-Type repository
-org.apache.oodt.cas.filemgr.mime.type.repository=/usr/local/coal-sds-deploy/etc/mime-types.xml
+org.apache.oodt.cas.filemgr.mime.type.repository=/usr/local/coal-sds-deploy/filemgr/etc/mime-types.xml
 
 
 ############ data source configuration ##################################
diff --git a/filemgr/src/main/resources/policy/oodt/product-types.xml b/filemgr/src/main/resources/policy/oodt/product-types.xml
index 1d8a8d9..35331ab 100644
--- a/filemgr/src/main/resources/policy/oodt/product-types.xml
+++ b/filemgr/src/main/resources/policy/oodt/product-types.xml
@@ -17,7 +17,7 @@ limitations under the License.
 -->
 <cas:producttypes xmlns:cas="http://oodt.jpl.nasa.gov/1.0/cas">
   <type id="urn:oodt:GenericFile" name="GenericFile">
-    <repository path="file://usr/local/coal-sds-deploy/data/archive"/>
+    <repository path="file:///usr/local/coal-sds-deploy/data/archive"/>
     <versioner class="org.apache.oodt.cas.filemgr.versioning.BasicVersioner"/>
     <!--
 You can optionally specify a 'trim' tag to identify whether