This is an automated email from the ASF dual-hosted git repository.

lewismc pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-sdap-edge.git


The following commit(s) were added to refs/heads/master by this push:
     new 54a77ce  SDAP-214 Simplify EDGE directory structure
     new c725dad  Merge pull request #10 from lewismc/SDAP-214
54a77ce is described below

commit 54a77ce6a3a35584d3be7c31da4bcf8248a318dc
Author: Lewis John McGibbney <[email protected]>
AuthorDate: Tue Nov 26 12:20:01 2019 -0800

    SDAP-214 Simplify EDGE directory structure
---
 README.md                                          |  19 +-
 src/main/python/config.conf => config.conf         |   0
 .../src/create_imagery_provider.sql                |   0
 .../src/create_product_type_view.sql               |   0
 .../src/create_product_view.sql                    |   0
 src/main/python/edge-env.bash => edge-env.bash     |   0
 src/main/python/edge-env.csh => edge-env.csh       |   0
 .../tie/collection => libraries/edge}/__init__.py  |   0
 .../libraries => libraries}/edge/dateutility.py    |   0
 .../edge/elasticsearch}/__init__.py                |   0
 .../edge/elasticsearch/datasetwriter.py            |   0
 .../edge/elasticsearch/granulewriter.py            |   0
 .../edge/elasticsearch/opensearch}/__init__.py     |   0
 .../opensearch/atomresponsebyelasticsearch.py      |   0
 .../opensearch/datasetatomresponse.py              |   0
 .../opensearch/granuleatomresponse.py              |   0
 .../libraries => libraries}/edge/httputility.py    |   0
 .../edge/opensearch}/__init__.py                   |   0
 .../edge/opensearch/atomresponse.py                |   0
 .../edge/opensearch/atomresponsebysolr.py          |   0
 .../edge/opensearch/datacastingresponsebysolr.py   |   0
 .../edge/opensearch/datasetatomresponse.py         |   0
 .../edge/opensearch/datasetgcmdresponse.py         |   0
 .../edge/opensearch/datasetgranulewriter.py        |   0
 .../edge/opensearch/datasetisoresponse.py          |   0
 .../edge/opensearch/datasetresponsebysolr.py       |   0
 .../edge/opensearch/datasetrssresponse.py          |   0
 .../edge/opensearch/datasetwriter.py               |   0
 .../edge/opensearch/fgdcresponse.py                |   0
 .../edge/opensearch/fgdcresponsebysolr.py          |   0
 .../edge/opensearch/gcmdresponsebysolr.py          |   0
 .../edge/opensearch/granuleatomresponse.py         |   0
 .../edge/opensearch/granuledatacastingresponse.py  |   0
 .../edge/opensearch/granulefgdcresponse.py         |   0
 .../edge/opensearch/granuleisoresponse.py          |   0
 .../edge/opensearch/granuleresponsebysolr.py       |   0
 .../edge/opensearch/granulerssresponse.py          |   0
 .../edge/opensearch/granulewriter.py               |   0
 .../edge/opensearch/isoresponse.py                 |   0
 .../edge/opensearch/isoresponsebysolr.py           |   0
 .../edge/opensearch/response.py                    |   0
 .../edge/opensearch/responsebysolr.py              |   0
 .../edge/opensearch/responsewriter.py              |   0
 .../edge/opensearch/rssresponse.py                 |   0
 .../edge/opensearch/rssresponsebysolr.py           |   0
 .../edge/opensearch/solrcmrtemplateresponse.py     |   0
 .../edge/opensearch/solrtemplateresponse.py        |   0
 .../edge/opensearch/templateresponse.py            |   0
 .../json => libraries/edge/response}/__init__.py   |   0
 .../edge/response/estemplateresponse.py            |   0
 .../edge/response/jsontemplateresponse.py          |   0
 .../edge/response/solrfacettemplateresponse.py     |   0
 .../edge/response/solrjsontemplateresponse.py      |   0
 .../libraries => libraries}/edge/spatialsearch.py  |   0
 .../spurs => libraries/edge/writer}/__init__.py    |   0
 .../edge/writer/estemplateresponsewriter.py        |   0
 .../edge/writer/genericproxywriter.py              |   0
 .../edge/writer/proxywriter.py                     |   0
 .../edge/writer/solrtemplateresponsewriter.py      |   0
 .../edge/writer/templateresponsewriter.py          |   0
 src/main/python/logging.conf => logging.conf       |   0
 .../python/pluginhandler.py => pluginhandler.py    |   0
 {src/main/python/plugins => plugins}/TestPlugin.py |   0
 .../plugins/slcp/umm-json => plugins}/__init__.py  |   0
 .../slcp/suggest => plugins/dataset}/__init__.py   |   0
 .../plugins => plugins}/dataset/atom/AtomWriter.py |   0
 .../stats => plugins/dataset/atom}/__init__.py     |   0
 .../plugins => plugins}/dataset/atom/plugin.conf   |   0
 .../plugins => plugins}/dataset/gcmd/DifWriter.py  |   0
 .../indicator => plugins/dataset/gcmd}/__init__.py |   0
 .../dataset/gcmd/dif_template.xml                  |   0
 .../plugins => plugins}/dataset/gcmd/plugin.conf   |   0
 .../plugins => plugins}/dataset/iso/IsoWriter.py   |   0
 .../granule => plugins/dataset/iso}/__init__.py    |   0
 .../dataset/iso/iso_template.xml                   |   0
 .../plugins => plugins}/dataset/iso/plugin.conf    |   0
 .../plugins => plugins}/dataset/rss/RssWriter.py   |   0
 .../slcp/facet => plugins/dataset/rss}/__init__.py |   0
 .../plugins => plugins}/dataset/rss/plugin.conf    |   0
 .../slcp/echo10 => plugins/example}/__init__.py    |   0
 .../plugins => plugins}/example/elastic/Writer.py  |   0
 .../dat => plugins/example/elastic}/__init__.py    |   0
 .../example/elastic/plugin.conf                    |   0
 .../example/elastic/template.xml                   |   0
 .../plugins => plugins}/example/json/JsonWriter.py |   0
 .../content => plugins/example/json}/__init__.py   |   0
 .../slcp/basin => plugins/granule}/__init__.py     |   0
 .../plugins => plugins}/granule/atom/AtomWriter.py |   0
 .../slcp => plugins/granule}/atom/__init__.py      |   0
 .../rss => plugins/granule/atom}/plugin.conf       |   0
 .../granule/datacasting/DatacastingWriter.py       |   0
 .../granule/datacasting}/__init__.py               |   0
 .../granule/datacasting/datacasting_template.xml   |   0
 .../granule/datacasting/plugin.conf                |   0
 .../plugins => plugins}/granule/fgdc/FgdcWriter.py |   0
 .../json => plugins/granule/fgdc}/__init__.py      |   0
 .../granule/fgdc/fgdc_template.xml                 |   0
 .../plugins => plugins}/granule/fgdc/plugin.conf   |   0
 .../plugins => plugins}/granule/iso/IsoWriter.py   |   0
 .../samos => plugins/granule/iso}/__init__.py      |   0
 .../granule/iso/iso_template.xml                   |   0
 .../plugins => plugins}/granule/iso/plugin.conf    |   0
 .../plugins => plugins}/granule/rss/RssWriter.py   |   0
 .../iso => plugins/granule/rss}/__init__.py        |   0
 .../atom => plugins/granule/rss}/plugin.conf       |   0
 .../atom => plugins/heartbeat}/__init__.py         |   0
 .../plugins => plugins}/heartbeat/json/Writer.py   |   0
 .../heartbeat/json}/__init__.py                    |   0
 .../plugins => plugins}/heartbeat/json/plugin.conf |   0
 .../atom => plugins/icoads}/__init__.py            |   0
 .../plugins => plugins}/icoads/json/Writer.py      |   0
 .../icoads/json}/__init__.py                       |   0
 .../plugins => plugins}/icoads/json/plugin.conf    |   0
 .../plugins => plugins}/icoads/json/template.json  |   0
 .../product/iso => plugins/nexus}/__init__.py      |   0
 .../nexus/climatology}/Writer.py                   |   0
 .../atom => plugins/nexus/climatology}/__init__.py |   0
 .../nexus/climatology/plugin.conf                  |   0
 .../plugins => plugins}/nexus/solr/Writer.py       |   0
 .../product => plugins/nexus/solr}/__init__.py     |   0
 .../plugins => plugins}/nexus/solr/plugin.conf     |   0
 .../nexus/subsetter}/Writer.py                     |   0
 .../pt => plugins/nexus/subsetter}/__init__.py     |   0
 .../nexus/subsetter/plugin.conf                    |   0
 .../oceanxtremes}/__init__.py                      |   0
 .../oceanxtremes/datacasting/Writer.py             |   0
 .../oceanxtremes/datacasting}/__init__.py          |   0
 .../oceanxtremes/datacasting/plugin.conf           |   0
 .../oceanxtremes/datacasting/template.xml          |   0
 .../oceanxtremes/post/Writer.py                    |   0
 .../json => plugins/oceanxtremes/post}/__init__.py |   0
 .../oceanxtremes/post/plugin.conf                  |   0
 .../python/plugins => plugins}/oiip/__init__.py    |   0
 .../python/plugins => plugins}/oiip/json/Writer.py |   0
 .../post => plugins/oiip/json}/__init__.py         |   0
 .../plugins => plugins}/oiip/json/plugin.conf      |   0
 .../plugins => plugins}/oiip/json/template.json    |   0
 .../python/plugins => plugins}/oiip/xml/Writer.py  |   0
 .../datacasting => plugins/oiip/xml}/__init__.py   |   0
 .../plugins => plugins}/oiip/xml/plugin.conf       |   0
 .../plugins => plugins}/oiip/xml/template.xml      |   0
 .../passthrough}/__init__.py                       |   0
 .../passthrough/pt/PassThroughWriter.py            |   0
 .../passthrough/pt}/__init__.py                    |   0
 .../plugins => plugins}/passthrough/pt/plugin.conf |   0
 .../nexus/solr => plugins/product}/__init__.py     |   0
 .../plugins => plugins}/product/atom/AtomWriter.py |   0
 .../plugins => plugins}/product/atom/Writer.py     |   0
 .../product/atom}/__init__.py                      |   0
 .../plugins => plugins}/product/atom/plugin.conf   |   0
 .../plugins => plugins}/product/atom/template.xml  |   0
 .../plugins => plugins}/product/iso/Writer.py      |   0
 .../nexus => plugins/product/iso}/__init__.py      |   0
 .../plugins => plugins}/product/iso/plugin.conf    |   0
 .../plugins => plugins}/product/iso/template.xml   |   0
 .../json => plugins/productType}/__init__.py       |   0
 .../productType/atom/AtomWriter.py                 |   0
 .../productType/atom}/__init__.py                  |   0
 .../productType/atom/plugin.conf                   |   0
 .../json => plugins/product_type}/__init__.py      |   0
 .../product_type/atom/Writer.py                    |   0
 .../product_type/atom}/__init__.py                 |   0
 .../product_type/atom/plugin.conf                  |   0
 .../product_type/atom/template.xml                 |   0
 .../plugins => plugins}/product_type/iso/Writer.py |   0
 .../rss => plugins/product_type/iso}/__init__.py   |   0
 .../product_type/iso/plugin.conf                   |   0
 .../product_type/iso/template.xml                  |   0
 .../granule/iso => plugins/samos}/__init__.py      |   0
 .../plugins => plugins}/samos/json/Writer.py       |   0
 .../fgdc => plugins/samos/json}/__init__.py        |   0
 .../plugins => plugins}/samos/json/plugin.conf     |   0
 .../plugins => plugins}/samos/json/template.json   |   0
 .../datacasting => plugins/slcp}/__init__.py       |   0
 .../python/plugins => plugins}/slcp/atom/Writer.py |   0
 .../granule => plugins/slcp}/atom/__init__.py      |   0
 .../plugins => plugins}/slcp/atom/plugin.conf      |   0
 .../plugins => plugins}/slcp/atom/template.xml     |   0
 .../plugins => plugins}/slcp/basin/Writer.py       |   0
 .../granule => plugins/slcp/basin}/__init__.py     |   0
 .../plugins => plugins}/slcp/basin/plugin.conf     |   0
 .../plugins => plugins}/slcp/basin/template.json   |   0
 .../plugins => plugins}/slcp/content/Writer.py     |   0
 .../json => plugins/slcp/content}/__init__.py      |   0
 .../plugins => plugins}/slcp/content/plugin.conf   |   0
 .../plugins => plugins}/slcp/content/template.xml  |   0
 .../python/plugins => plugins}/slcp/dat/Writer.py  |   0
 .../elastic => plugins/slcp/dat}/__init__.py       |   0
 .../plugins => plugins}/slcp/dat/plugin.conf       |   0
 .../plugins => plugins}/slcp/dat/template.json     |   0
 .../plugins => plugins}/slcp/echo10/Writer.py      |   0
 .../example => plugins/slcp/echo10}/__init__.py    |   0
 .../plugins => plugins}/slcp/echo10/plugin.conf    |   0
 .../plugins => plugins}/slcp/echo10/template.xml   |   0
 .../plugins => plugins}/slcp/facet/Writer.py       |   0
 .../dataset/rss => plugins/slcp/facet}/__init__.py |   0
 .../plugins => plugins}/slcp/facet/plugin.conf     |   0
 .../plugins => plugins}/slcp/facet/template.xml    |   0
 .../plugins => plugins}/slcp/granule/Writer.py     |   0
 .../iso => plugins/slcp/granule}/__init__.py       |   0
 .../plugins => plugins}/slcp/granule/plugin.conf   |   0
 .../plugins => plugins}/slcp/granule/template.xml  |   0
 .../plugins => plugins}/slcp/indicator/Writer.py   |   0
 .../gcmd => plugins/slcp/indicator}/__init__.py    |   0
 .../plugins => plugins}/slcp/indicator/plugin.conf |   0
 .../plugins => plugins}/slcp/stats/Writer.py       |   0
 .../atom => plugins/slcp/stats}/__init__.py        |   0
 .../plugins => plugins}/slcp/stats/plugin.conf     |   0
 .../plugins => plugins}/slcp/stats/template.json   |   0
 .../plugins => plugins}/slcp/suggest/Writer.py     |   0
 .../dataset => plugins/slcp/suggest}/__init__.py   |   0
 .../plugins => plugins}/slcp/suggest/plugin.conf   |   0
 .../plugins => plugins}/slcp/umm-json/Writer.py    |   0
 .../plugins => plugins/slcp/umm-json}/__init__.py  |   0
 .../plugins => plugins}/slcp/umm-json/plugin.conf  |   0
 .../slcp/umm-json/template.json                    |   0
 .../edge/writer => plugins/spurs}/__init__.py      |   0
 .../spurs2 => plugins/spurs}/json/Writer.py        |   0
 .../response => plugins/spurs/json}/__init__.py    |   0
 .../plugins => plugins}/spurs/json/plugin.conf     |   0
 .../plugins => plugins}/spurs/json/template.json   |   0
 .../edge/opensearch => plugins/spurs2}/__init__.py |   0
 .../spurs => plugins/spurs2}/json/Writer.py        |   0
 .../opensearch => plugins/spurs2/json}/__init__.py |   0
 .../plugins => plugins}/spurs2/json/plugin.conf    |   0
 .../plugins => plugins}/spurs2/json/template.json  |   0
 .../edge/elasticsearch => plugins/tie}/__init__.py |   0
 .../plugins => plugins}/tie/collection/Writer.py   |   0
 .../edge => plugins/tie/collection}/__init__.py    |   0
 .../plugins => plugins}/tie/collection/plugin.conf |   0
 pom.xml                                            | 103 ------
 .../requestresponder.py => requestresponder.py     |   0
 .../python/requirements.txt => requirements.txt    |   0
 src/main/python/server.py => server.py             |   0
 .../solr => solr}/product/conf/data-config.xml     |   0
 .../product/conf/dataimport.properties             |   0
 {src/main/solr => solr}/product/conf/schema.xml    |   0
 .../main/solr => solr}/product/conf/solrconfig.xml |   0
 .../product_type/conf/data-config.xml              |   0
 .../product_type/conf/dataimport.properties        |   0
 .../solr => solr}/product_type/conf/schema.xml     |   0
 .../solr => solr}/product_type/conf/solrconfig.xml |   0
 src/site/apt/index.apt                             |  14 -
 src/site/apt/install/index.apt                     | 144 ---------
 src/site/apt/operate/index.apt                     | 344 ---------------------
 src/site/apt/release/index-2.2.1.apt               |  73 -----
 src/site/apt/release/index-3.0.0.apt               |  71 -----
 src/site/apt/release/index-3.1.0.apt               |  81 -----
 src/site/apt/release/index-3.1.1.apt               |  89 ------
 src/site/apt/release/index-3.2.0.apt               |  79 -----
 src/site/apt/release/index-3.2.1.apt               |  79 -----
 src/site/apt/release/index-3.2.2.apt               |  81 -----
 src/site/apt/release/index-3.3.0.apt               |  81 -----
 src/site/apt/release/index-4.0.0.apt               |  79 -----
 src/site/apt/release/index-4.1.0.apt               |  79 -----
 src/site/apt/release/index-4.2.0.apt               |  79 -----
 src/site/apt/release/index-4.3.0.apt               |  77 -----
 src/site/apt/release/index-4.4.0.apt               |  78 -----
 src/site/apt/release/index-4.4.1.apt               |  79 -----
 src/site/apt/release/index.apt                     | 101 ------
 src/site/resources/images/podaac_logo.jpg          | Bin 5151 -> 0 bytes
 src/site/site.xml                                  |  36 ---
 .../templates => templates}/podaac-dataset-osd.xml |   0
 .../templates => templates}/podaac-granule-osd.xml |   0
 264 files changed, 9 insertions(+), 1857 deletions(-)

diff --git a/README.md b/README.md
index 8be6037..9d730e8 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 # The Extensible Data Gateway Environment (EDGE)
-The Extensible Data Gateway Environment (EDGE) is a data integration platform 
designed to facilitate high-performance geospatial data discovery and access 
with the ability to support multimetadata standard specifications. EDGE is 
designed with two main building blocks: data aggregation service and enterprise 
geospatial indexed search cluster. The data aggregation service provides web 
service interfaces for searches, metadata packaging, and data access. 
Aggregation often involves retrievi [...]
+The Extensible Data Gateway Environment (EDGE) is a data integration platform 
designed to facilitate high-performance geospatial data discovery and access 
with the ability to support multimetadata standard specifications. EDGE is 
designed with two main building blocks: data aggregation service and enterprise 
geospatial indexed search cluster. The data aggregation service provides web 
service interfaces for searches, metadata packaging, and data access. 
Aggregation often involves retrievi [...]
 
 # Setup
 
@@ -13,8 +13,7 @@ The Extensible Data Gateway Environment (EDGE) is a data 
integration platform de
 2. Install dependencies
 
     ````
-    cd edge/src/main/python
-    pip install -r requirements.txt
+    pip3 install -r requirements.txt
     ````
 
 3. Update pythonpath
@@ -26,7 +25,7 @@ The Extensible Data Gateway Environment (EDGE) is a data 
integration platform de
 4. Launch EDGE service
 
     ````
-    python server.py
+    python3 server.py
     ````
 # Adding Custom Plugin
 
@@ -34,23 +33,23 @@ You will need to customize EDGE to work with your existing 
Apache Solr or Elasti
 
 ## ElasticSearch
 
-For an ElasticSearch example plugin, see 
[plugins/example/elastic](src/main/python/plugins/example/elastic)
+For an ElasticSearch example plugin, see `plugins/example/elastic`
 
 1. Copy the plugins/example/elastic plugin into a new directory, for example, 
plugins/myproject/elastic.
 
-2. Update [plugin.conf](src/main/python/plugins/example/elastic/plugin.conf) 
datasetUrl to point to an ElasticSarch index endpoint.
+2. Update `plugin.conf` datasetUrl to point to an ElasticSarch index endpoint.
 
-3. Update [template.xml](src/main/python/plugins/example/elastic/template.xml) 
to modify the response XML. Metadata values for each document returned are 
stored in the doc variable dictionary, for example, doc['ShortName'].
+3. Update `template.xml` to modify the response XML. Metadata values for each 
document returned are stored in the doc variable dictionary, for example, 
doc['ShortName'].
 
-    To handle additional search parameters, update 
[plugin.conf](src/main/python/plugins/example/elastic/plugin.conf) parameters 
to include additional parameters, for example,
+    To handle additional search parameters, update `plugin.conf` parameters to 
include additional parameters, for example,
 
     ````
     parameters=keyword,bbox,startTime,endTime
     ````
 
-    Update [Writer.py](src/main/python/plugins/example/elastic/Writer.py) to 
handle these additional parameters by modifying the resulting query sent to 
ElasticSearch endpoint.
+    Update `Writer.py` to handle these additional parameters by modifying the 
resulting query sent to ElasticSearch endpoint.
 
-4. Update [server.py](src/main/python/server.py) to add a new endpoint that 
will invoke the newly created plugin, for example,
+4. Update `server.py` to add a new endpoint that will invoke the newly created 
plugin, for example,
 
     ````
     (r"/myplugin/es", GenericHandler, dict(pluginName='myplugin', 
format=['elastic'])),
diff --git a/src/main/python/config.conf b/config.conf
similarity index 100%
rename from src/main/python/config.conf
rename to config.conf
diff --git a/src/main/database/src/create_imagery_provider.sql 
b/database/src/create_imagery_provider.sql
similarity index 100%
rename from src/main/database/src/create_imagery_provider.sql
rename to database/src/create_imagery_provider.sql
diff --git a/src/main/database/src/create_product_type_view.sql 
b/database/src/create_product_type_view.sql
similarity index 100%
rename from src/main/database/src/create_product_type_view.sql
rename to database/src/create_product_type_view.sql
diff --git a/src/main/database/src/create_product_view.sql 
b/database/src/create_product_view.sql
similarity index 100%
rename from src/main/database/src/create_product_view.sql
rename to database/src/create_product_view.sql
diff --git a/src/main/python/edge-env.bash b/edge-env.bash
similarity index 100%
rename from src/main/python/edge-env.bash
rename to edge-env.bash
diff --git a/src/main/python/edge-env.csh b/edge-env.csh
similarity index 100%
rename from src/main/python/edge-env.csh
rename to edge-env.csh
diff --git a/src/main/python/plugins/tie/collection/__init__.py 
b/libraries/edge/__init__.py
similarity index 100%
rename from src/main/python/plugins/tie/collection/__init__.py
rename to libraries/edge/__init__.py
diff --git a/src/main/python/libraries/edge/dateutility.py 
b/libraries/edge/dateutility.py
similarity index 100%
rename from src/main/python/libraries/edge/dateutility.py
rename to libraries/edge/dateutility.py
diff --git a/src/main/python/plugins/tie/__init__.py 
b/libraries/edge/elasticsearch/__init__.py
similarity index 100%
rename from src/main/python/plugins/tie/__init__.py
rename to libraries/edge/elasticsearch/__init__.py
diff --git a/src/main/python/libraries/edge/elasticsearch/datasetwriter.py 
b/libraries/edge/elasticsearch/datasetwriter.py
similarity index 100%
rename from src/main/python/libraries/edge/elasticsearch/datasetwriter.py
rename to libraries/edge/elasticsearch/datasetwriter.py
diff --git a/src/main/python/libraries/edge/elasticsearch/granulewriter.py 
b/libraries/edge/elasticsearch/granulewriter.py
similarity index 100%
rename from src/main/python/libraries/edge/elasticsearch/granulewriter.py
rename to libraries/edge/elasticsearch/granulewriter.py
diff --git a/src/main/python/plugins/spurs2/json/__init__.py 
b/libraries/edge/elasticsearch/opensearch/__init__.py
similarity index 100%
rename from src/main/python/plugins/spurs2/json/__init__.py
rename to libraries/edge/elasticsearch/opensearch/__init__.py
diff --git 
a/src/main/python/libraries/edge/elasticsearch/opensearch/atomresponsebyelasticsearch.py
 b/libraries/edge/elasticsearch/opensearch/atomresponsebyelasticsearch.py
similarity index 100%
rename from 
src/main/python/libraries/edge/elasticsearch/opensearch/atomresponsebyelasticsearch.py
rename to libraries/edge/elasticsearch/opensearch/atomresponsebyelasticsearch.py
diff --git 
a/src/main/python/libraries/edge/elasticsearch/opensearch/datasetatomresponse.py
 b/libraries/edge/elasticsearch/opensearch/datasetatomresponse.py
similarity index 100%
rename from 
src/main/python/libraries/edge/elasticsearch/opensearch/datasetatomresponse.py
rename to libraries/edge/elasticsearch/opensearch/datasetatomresponse.py
diff --git 
a/src/main/python/libraries/edge/elasticsearch/opensearch/granuleatomresponse.py
 b/libraries/edge/elasticsearch/opensearch/granuleatomresponse.py
similarity index 100%
rename from 
src/main/python/libraries/edge/elasticsearch/opensearch/granuleatomresponse.py
rename to libraries/edge/elasticsearch/opensearch/granuleatomresponse.py
diff --git a/src/main/python/libraries/edge/httputility.py 
b/libraries/edge/httputility.py
similarity index 100%
rename from src/main/python/libraries/edge/httputility.py
rename to libraries/edge/httputility.py
diff --git a/src/main/python/plugins/spurs2/__init__.py 
b/libraries/edge/opensearch/__init__.py
similarity index 100%
rename from src/main/python/plugins/spurs2/__init__.py
rename to libraries/edge/opensearch/__init__.py
diff --git a/src/main/python/libraries/edge/opensearch/atomresponse.py 
b/libraries/edge/opensearch/atomresponse.py
similarity index 100%
rename from src/main/python/libraries/edge/opensearch/atomresponse.py
rename to libraries/edge/opensearch/atomresponse.py
diff --git a/src/main/python/libraries/edge/opensearch/atomresponsebysolr.py 
b/libraries/edge/opensearch/atomresponsebysolr.py
similarity index 100%
rename from src/main/python/libraries/edge/opensearch/atomresponsebysolr.py
rename to libraries/edge/opensearch/atomresponsebysolr.py
diff --git 
a/src/main/python/libraries/edge/opensearch/datacastingresponsebysolr.py 
b/libraries/edge/opensearch/datacastingresponsebysolr.py
similarity index 100%
rename from 
src/main/python/libraries/edge/opensearch/datacastingresponsebysolr.py
rename to libraries/edge/opensearch/datacastingresponsebysolr.py
diff --git a/src/main/python/libraries/edge/opensearch/datasetatomresponse.py 
b/libraries/edge/opensearch/datasetatomresponse.py
similarity index 100%
rename from src/main/python/libraries/edge/opensearch/datasetatomresponse.py
rename to libraries/edge/opensearch/datasetatomresponse.py
diff --git a/src/main/python/libraries/edge/opensearch/datasetgcmdresponse.py 
b/libraries/edge/opensearch/datasetgcmdresponse.py
similarity index 100%
rename from src/main/python/libraries/edge/opensearch/datasetgcmdresponse.py
rename to libraries/edge/opensearch/datasetgcmdresponse.py
diff --git a/src/main/python/libraries/edge/opensearch/datasetgranulewriter.py 
b/libraries/edge/opensearch/datasetgranulewriter.py
similarity index 100%
rename from src/main/python/libraries/edge/opensearch/datasetgranulewriter.py
rename to libraries/edge/opensearch/datasetgranulewriter.py
diff --git a/src/main/python/libraries/edge/opensearch/datasetisoresponse.py 
b/libraries/edge/opensearch/datasetisoresponse.py
similarity index 100%
rename from src/main/python/libraries/edge/opensearch/datasetisoresponse.py
rename to libraries/edge/opensearch/datasetisoresponse.py
diff --git a/src/main/python/libraries/edge/opensearch/datasetresponsebysolr.py 
b/libraries/edge/opensearch/datasetresponsebysolr.py
similarity index 100%
rename from src/main/python/libraries/edge/opensearch/datasetresponsebysolr.py
rename to libraries/edge/opensearch/datasetresponsebysolr.py
diff --git a/src/main/python/libraries/edge/opensearch/datasetrssresponse.py 
b/libraries/edge/opensearch/datasetrssresponse.py
similarity index 100%
rename from src/main/python/libraries/edge/opensearch/datasetrssresponse.py
rename to libraries/edge/opensearch/datasetrssresponse.py
diff --git a/src/main/python/libraries/edge/opensearch/datasetwriter.py 
b/libraries/edge/opensearch/datasetwriter.py
similarity index 100%
rename from src/main/python/libraries/edge/opensearch/datasetwriter.py
rename to libraries/edge/opensearch/datasetwriter.py
diff --git a/src/main/python/libraries/edge/opensearch/fgdcresponse.py 
b/libraries/edge/opensearch/fgdcresponse.py
similarity index 100%
rename from src/main/python/libraries/edge/opensearch/fgdcresponse.py
rename to libraries/edge/opensearch/fgdcresponse.py
diff --git a/src/main/python/libraries/edge/opensearch/fgdcresponsebysolr.py 
b/libraries/edge/opensearch/fgdcresponsebysolr.py
similarity index 100%
rename from src/main/python/libraries/edge/opensearch/fgdcresponsebysolr.py
rename to libraries/edge/opensearch/fgdcresponsebysolr.py
diff --git a/src/main/python/libraries/edge/opensearch/gcmdresponsebysolr.py 
b/libraries/edge/opensearch/gcmdresponsebysolr.py
similarity index 100%
rename from src/main/python/libraries/edge/opensearch/gcmdresponsebysolr.py
rename to libraries/edge/opensearch/gcmdresponsebysolr.py
diff --git a/src/main/python/libraries/edge/opensearch/granuleatomresponse.py 
b/libraries/edge/opensearch/granuleatomresponse.py
similarity index 100%
rename from src/main/python/libraries/edge/opensearch/granuleatomresponse.py
rename to libraries/edge/opensearch/granuleatomresponse.py
diff --git 
a/src/main/python/libraries/edge/opensearch/granuledatacastingresponse.py 
b/libraries/edge/opensearch/granuledatacastingresponse.py
similarity index 100%
rename from 
src/main/python/libraries/edge/opensearch/granuledatacastingresponse.py
rename to libraries/edge/opensearch/granuledatacastingresponse.py
diff --git a/src/main/python/libraries/edge/opensearch/granulefgdcresponse.py 
b/libraries/edge/opensearch/granulefgdcresponse.py
similarity index 100%
rename from src/main/python/libraries/edge/opensearch/granulefgdcresponse.py
rename to libraries/edge/opensearch/granulefgdcresponse.py
diff --git a/src/main/python/libraries/edge/opensearch/granuleisoresponse.py 
b/libraries/edge/opensearch/granuleisoresponse.py
similarity index 100%
rename from src/main/python/libraries/edge/opensearch/granuleisoresponse.py
rename to libraries/edge/opensearch/granuleisoresponse.py
diff --git a/src/main/python/libraries/edge/opensearch/granuleresponsebysolr.py 
b/libraries/edge/opensearch/granuleresponsebysolr.py
similarity index 100%
rename from src/main/python/libraries/edge/opensearch/granuleresponsebysolr.py
rename to libraries/edge/opensearch/granuleresponsebysolr.py
diff --git a/src/main/python/libraries/edge/opensearch/granulerssresponse.py 
b/libraries/edge/opensearch/granulerssresponse.py
similarity index 100%
rename from src/main/python/libraries/edge/opensearch/granulerssresponse.py
rename to libraries/edge/opensearch/granulerssresponse.py
diff --git a/src/main/python/libraries/edge/opensearch/granulewriter.py 
b/libraries/edge/opensearch/granulewriter.py
similarity index 100%
rename from src/main/python/libraries/edge/opensearch/granulewriter.py
rename to libraries/edge/opensearch/granulewriter.py
diff --git a/src/main/python/libraries/edge/opensearch/isoresponse.py 
b/libraries/edge/opensearch/isoresponse.py
similarity index 100%
rename from src/main/python/libraries/edge/opensearch/isoresponse.py
rename to libraries/edge/opensearch/isoresponse.py
diff --git a/src/main/python/libraries/edge/opensearch/isoresponsebysolr.py 
b/libraries/edge/opensearch/isoresponsebysolr.py
similarity index 100%
rename from src/main/python/libraries/edge/opensearch/isoresponsebysolr.py
rename to libraries/edge/opensearch/isoresponsebysolr.py
diff --git a/src/main/python/libraries/edge/opensearch/response.py 
b/libraries/edge/opensearch/response.py
similarity index 100%
rename from src/main/python/libraries/edge/opensearch/response.py
rename to libraries/edge/opensearch/response.py
diff --git a/src/main/python/libraries/edge/opensearch/responsebysolr.py 
b/libraries/edge/opensearch/responsebysolr.py
similarity index 100%
rename from src/main/python/libraries/edge/opensearch/responsebysolr.py
rename to libraries/edge/opensearch/responsebysolr.py
diff --git a/src/main/python/libraries/edge/opensearch/responsewriter.py 
b/libraries/edge/opensearch/responsewriter.py
similarity index 100%
rename from src/main/python/libraries/edge/opensearch/responsewriter.py
rename to libraries/edge/opensearch/responsewriter.py
diff --git a/src/main/python/libraries/edge/opensearch/rssresponse.py 
b/libraries/edge/opensearch/rssresponse.py
similarity index 100%
rename from src/main/python/libraries/edge/opensearch/rssresponse.py
rename to libraries/edge/opensearch/rssresponse.py
diff --git a/src/main/python/libraries/edge/opensearch/rssresponsebysolr.py 
b/libraries/edge/opensearch/rssresponsebysolr.py
similarity index 100%
rename from src/main/python/libraries/edge/opensearch/rssresponsebysolr.py
rename to libraries/edge/opensearch/rssresponsebysolr.py
diff --git 
a/src/main/python/libraries/edge/opensearch/solrcmrtemplateresponse.py 
b/libraries/edge/opensearch/solrcmrtemplateresponse.py
similarity index 100%
rename from src/main/python/libraries/edge/opensearch/solrcmrtemplateresponse.py
rename to libraries/edge/opensearch/solrcmrtemplateresponse.py
diff --git a/src/main/python/libraries/edge/opensearch/solrtemplateresponse.py 
b/libraries/edge/opensearch/solrtemplateresponse.py
similarity index 100%
rename from src/main/python/libraries/edge/opensearch/solrtemplateresponse.py
rename to libraries/edge/opensearch/solrtemplateresponse.py
diff --git a/src/main/python/libraries/edge/opensearch/templateresponse.py 
b/libraries/edge/opensearch/templateresponse.py
similarity index 100%
rename from src/main/python/libraries/edge/opensearch/templateresponse.py
rename to libraries/edge/opensearch/templateresponse.py
diff --git a/src/main/python/plugins/spurs/json/__init__.py 
b/libraries/edge/response/__init__.py
similarity index 100%
rename from src/main/python/plugins/spurs/json/__init__.py
rename to libraries/edge/response/__init__.py
diff --git a/src/main/python/libraries/edge/response/estemplateresponse.py 
b/libraries/edge/response/estemplateresponse.py
similarity index 100%
rename from src/main/python/libraries/edge/response/estemplateresponse.py
rename to libraries/edge/response/estemplateresponse.py
diff --git a/src/main/python/libraries/edge/response/jsontemplateresponse.py 
b/libraries/edge/response/jsontemplateresponse.py
similarity index 100%
rename from src/main/python/libraries/edge/response/jsontemplateresponse.py
rename to libraries/edge/response/jsontemplateresponse.py
diff --git 
a/src/main/python/libraries/edge/response/solrfacettemplateresponse.py 
b/libraries/edge/response/solrfacettemplateresponse.py
similarity index 100%
rename from src/main/python/libraries/edge/response/solrfacettemplateresponse.py
rename to libraries/edge/response/solrfacettemplateresponse.py
diff --git 
a/src/main/python/libraries/edge/response/solrjsontemplateresponse.py 
b/libraries/edge/response/solrjsontemplateresponse.py
similarity index 100%
rename from src/main/python/libraries/edge/response/solrjsontemplateresponse.py
rename to libraries/edge/response/solrjsontemplateresponse.py
diff --git a/src/main/python/libraries/edge/spatialsearch.py 
b/libraries/edge/spatialsearch.py
similarity index 100%
rename from src/main/python/libraries/edge/spatialsearch.py
rename to libraries/edge/spatialsearch.py
diff --git a/src/main/python/plugins/spurs/__init__.py 
b/libraries/edge/writer/__init__.py
similarity index 100%
rename from src/main/python/plugins/spurs/__init__.py
rename to libraries/edge/writer/__init__.py
diff --git a/src/main/python/libraries/edge/writer/estemplateresponsewriter.py 
b/libraries/edge/writer/estemplateresponsewriter.py
similarity index 100%
rename from src/main/python/libraries/edge/writer/estemplateresponsewriter.py
rename to libraries/edge/writer/estemplateresponsewriter.py
diff --git a/src/main/python/libraries/edge/writer/genericproxywriter.py 
b/libraries/edge/writer/genericproxywriter.py
similarity index 100%
rename from src/main/python/libraries/edge/writer/genericproxywriter.py
rename to libraries/edge/writer/genericproxywriter.py
diff --git a/src/main/python/libraries/edge/writer/proxywriter.py 
b/libraries/edge/writer/proxywriter.py
similarity index 100%
rename from src/main/python/libraries/edge/writer/proxywriter.py
rename to libraries/edge/writer/proxywriter.py
diff --git 
a/src/main/python/libraries/edge/writer/solrtemplateresponsewriter.py 
b/libraries/edge/writer/solrtemplateresponsewriter.py
similarity index 100%
rename from src/main/python/libraries/edge/writer/solrtemplateresponsewriter.py
rename to libraries/edge/writer/solrtemplateresponsewriter.py
diff --git a/src/main/python/libraries/edge/writer/templateresponsewriter.py 
b/libraries/edge/writer/templateresponsewriter.py
similarity index 100%
rename from src/main/python/libraries/edge/writer/templateresponsewriter.py
rename to libraries/edge/writer/templateresponsewriter.py
diff --git a/src/main/python/logging.conf b/logging.conf
similarity index 100%
rename from src/main/python/logging.conf
rename to logging.conf
diff --git a/src/main/python/pluginhandler.py b/pluginhandler.py
similarity index 100%
rename from src/main/python/pluginhandler.py
rename to pluginhandler.py
diff --git a/src/main/python/plugins/TestPlugin.py b/plugins/TestPlugin.py
similarity index 100%
rename from src/main/python/plugins/TestPlugin.py
rename to plugins/TestPlugin.py
diff --git a/src/main/python/plugins/slcp/umm-json/__init__.py 
b/plugins/__init__.py
similarity index 100%
rename from src/main/python/plugins/slcp/umm-json/__init__.py
rename to plugins/__init__.py
diff --git a/src/main/python/plugins/slcp/suggest/__init__.py 
b/plugins/dataset/__init__.py
similarity index 100%
rename from src/main/python/plugins/slcp/suggest/__init__.py
rename to plugins/dataset/__init__.py
diff --git a/src/main/python/plugins/dataset/atom/AtomWriter.py 
b/plugins/dataset/atom/AtomWriter.py
similarity index 100%
rename from src/main/python/plugins/dataset/atom/AtomWriter.py
rename to plugins/dataset/atom/AtomWriter.py
diff --git a/src/main/python/plugins/slcp/stats/__init__.py 
b/plugins/dataset/atom/__init__.py
similarity index 100%
rename from src/main/python/plugins/slcp/stats/__init__.py
rename to plugins/dataset/atom/__init__.py
diff --git a/src/main/python/plugins/dataset/atom/plugin.conf 
b/plugins/dataset/atom/plugin.conf
similarity index 100%
rename from src/main/python/plugins/dataset/atom/plugin.conf
rename to plugins/dataset/atom/plugin.conf
diff --git a/src/main/python/plugins/dataset/gcmd/DifWriter.py 
b/plugins/dataset/gcmd/DifWriter.py
similarity index 100%
rename from src/main/python/plugins/dataset/gcmd/DifWriter.py
rename to plugins/dataset/gcmd/DifWriter.py
diff --git a/src/main/python/plugins/slcp/indicator/__init__.py 
b/plugins/dataset/gcmd/__init__.py
similarity index 100%
rename from src/main/python/plugins/slcp/indicator/__init__.py
rename to plugins/dataset/gcmd/__init__.py
diff --git a/src/main/python/plugins/dataset/gcmd/dif_template.xml 
b/plugins/dataset/gcmd/dif_template.xml
similarity index 100%
rename from src/main/python/plugins/dataset/gcmd/dif_template.xml
rename to plugins/dataset/gcmd/dif_template.xml
diff --git a/src/main/python/plugins/dataset/gcmd/plugin.conf 
b/plugins/dataset/gcmd/plugin.conf
similarity index 100%
rename from src/main/python/plugins/dataset/gcmd/plugin.conf
rename to plugins/dataset/gcmd/plugin.conf
diff --git a/src/main/python/plugins/dataset/iso/IsoWriter.py 
b/plugins/dataset/iso/IsoWriter.py
similarity index 100%
rename from src/main/python/plugins/dataset/iso/IsoWriter.py
rename to plugins/dataset/iso/IsoWriter.py
diff --git a/src/main/python/plugins/slcp/granule/__init__.py 
b/plugins/dataset/iso/__init__.py
similarity index 100%
rename from src/main/python/plugins/slcp/granule/__init__.py
rename to plugins/dataset/iso/__init__.py
diff --git a/src/main/python/plugins/dataset/iso/iso_template.xml 
b/plugins/dataset/iso/iso_template.xml
similarity index 100%
rename from src/main/python/plugins/dataset/iso/iso_template.xml
rename to plugins/dataset/iso/iso_template.xml
diff --git a/src/main/python/plugins/dataset/iso/plugin.conf 
b/plugins/dataset/iso/plugin.conf
similarity index 100%
rename from src/main/python/plugins/dataset/iso/plugin.conf
rename to plugins/dataset/iso/plugin.conf
diff --git a/src/main/python/plugins/dataset/rss/RssWriter.py 
b/plugins/dataset/rss/RssWriter.py
similarity index 100%
rename from src/main/python/plugins/dataset/rss/RssWriter.py
rename to plugins/dataset/rss/RssWriter.py
diff --git a/src/main/python/plugins/slcp/facet/__init__.py 
b/plugins/dataset/rss/__init__.py
similarity index 100%
rename from src/main/python/plugins/slcp/facet/__init__.py
rename to plugins/dataset/rss/__init__.py
diff --git a/src/main/python/plugins/dataset/rss/plugin.conf 
b/plugins/dataset/rss/plugin.conf
similarity index 100%
rename from src/main/python/plugins/dataset/rss/plugin.conf
rename to plugins/dataset/rss/plugin.conf
diff --git a/src/main/python/plugins/slcp/echo10/__init__.py 
b/plugins/example/__init__.py
similarity index 100%
rename from src/main/python/plugins/slcp/echo10/__init__.py
rename to plugins/example/__init__.py
diff --git a/src/main/python/plugins/example/elastic/Writer.py 
b/plugins/example/elastic/Writer.py
similarity index 100%
rename from src/main/python/plugins/example/elastic/Writer.py
rename to plugins/example/elastic/Writer.py
diff --git a/src/main/python/plugins/slcp/dat/__init__.py 
b/plugins/example/elastic/__init__.py
similarity index 100%
rename from src/main/python/plugins/slcp/dat/__init__.py
rename to plugins/example/elastic/__init__.py
diff --git a/src/main/python/plugins/example/elastic/plugin.conf 
b/plugins/example/elastic/plugin.conf
similarity index 100%
rename from src/main/python/plugins/example/elastic/plugin.conf
rename to plugins/example/elastic/plugin.conf
diff --git a/src/main/python/plugins/example/elastic/template.xml 
b/plugins/example/elastic/template.xml
similarity index 100%
rename from src/main/python/plugins/example/elastic/template.xml
rename to plugins/example/elastic/template.xml
diff --git a/src/main/python/plugins/example/json/JsonWriter.py 
b/plugins/example/json/JsonWriter.py
similarity index 100%
rename from src/main/python/plugins/example/json/JsonWriter.py
rename to plugins/example/json/JsonWriter.py
diff --git a/src/main/python/plugins/slcp/content/__init__.py 
b/plugins/example/json/__init__.py
similarity index 100%
rename from src/main/python/plugins/slcp/content/__init__.py
rename to plugins/example/json/__init__.py
diff --git a/src/main/python/plugins/slcp/basin/__init__.py 
b/plugins/granule/__init__.py
similarity index 100%
rename from src/main/python/plugins/slcp/basin/__init__.py
rename to plugins/granule/__init__.py
diff --git a/src/main/python/plugins/granule/atom/AtomWriter.py 
b/plugins/granule/atom/AtomWriter.py
similarity index 100%
rename from src/main/python/plugins/granule/atom/AtomWriter.py
rename to plugins/granule/atom/AtomWriter.py
diff --git a/src/main/python/plugins/slcp/atom/__init__.py 
b/plugins/granule/atom/__init__.py
similarity index 100%
rename from src/main/python/plugins/slcp/atom/__init__.py
rename to plugins/granule/atom/__init__.py
diff --git a/src/main/python/plugins/granule/rss/plugin.conf 
b/plugins/granule/atom/plugin.conf
similarity index 100%
rename from src/main/python/plugins/granule/rss/plugin.conf
rename to plugins/granule/atom/plugin.conf
diff --git a/src/main/python/plugins/granule/datacasting/DatacastingWriter.py 
b/plugins/granule/datacasting/DatacastingWriter.py
similarity index 100%
rename from src/main/python/plugins/granule/datacasting/DatacastingWriter.py
rename to plugins/granule/datacasting/DatacastingWriter.py
diff --git a/src/main/python/plugins/slcp/__init__.py 
b/plugins/granule/datacasting/__init__.py
similarity index 100%
rename from src/main/python/plugins/slcp/__init__.py
rename to plugins/granule/datacasting/__init__.py
diff --git 
a/src/main/python/plugins/granule/datacasting/datacasting_template.xml 
b/plugins/granule/datacasting/datacasting_template.xml
similarity index 100%
rename from src/main/python/plugins/granule/datacasting/datacasting_template.xml
rename to plugins/granule/datacasting/datacasting_template.xml
diff --git a/src/main/python/plugins/granule/datacasting/plugin.conf 
b/plugins/granule/datacasting/plugin.conf
similarity index 100%
rename from src/main/python/plugins/granule/datacasting/plugin.conf
rename to plugins/granule/datacasting/plugin.conf
diff --git a/src/main/python/plugins/granule/fgdc/FgdcWriter.py 
b/plugins/granule/fgdc/FgdcWriter.py
similarity index 100%
rename from src/main/python/plugins/granule/fgdc/FgdcWriter.py
rename to plugins/granule/fgdc/FgdcWriter.py
diff --git a/src/main/python/plugins/samos/json/__init__.py 
b/plugins/granule/fgdc/__init__.py
similarity index 100%
rename from src/main/python/plugins/samos/json/__init__.py
rename to plugins/granule/fgdc/__init__.py
diff --git a/src/main/python/plugins/granule/fgdc/fgdc_template.xml 
b/plugins/granule/fgdc/fgdc_template.xml
similarity index 100%
rename from src/main/python/plugins/granule/fgdc/fgdc_template.xml
rename to plugins/granule/fgdc/fgdc_template.xml
diff --git a/src/main/python/plugins/granule/fgdc/plugin.conf 
b/plugins/granule/fgdc/plugin.conf
similarity index 100%
rename from src/main/python/plugins/granule/fgdc/plugin.conf
rename to plugins/granule/fgdc/plugin.conf
diff --git a/src/main/python/plugins/granule/iso/IsoWriter.py 
b/plugins/granule/iso/IsoWriter.py
similarity index 100%
rename from src/main/python/plugins/granule/iso/IsoWriter.py
rename to plugins/granule/iso/IsoWriter.py
diff --git a/src/main/python/plugins/samos/__init__.py 
b/plugins/granule/iso/__init__.py
similarity index 100%
rename from src/main/python/plugins/samos/__init__.py
rename to plugins/granule/iso/__init__.py
diff --git a/src/main/python/plugins/granule/iso/iso_template.xml 
b/plugins/granule/iso/iso_template.xml
similarity index 100%
rename from src/main/python/plugins/granule/iso/iso_template.xml
rename to plugins/granule/iso/iso_template.xml
diff --git a/src/main/python/plugins/granule/iso/plugin.conf 
b/plugins/granule/iso/plugin.conf
similarity index 100%
rename from src/main/python/plugins/granule/iso/plugin.conf
rename to plugins/granule/iso/plugin.conf
diff --git a/src/main/python/plugins/granule/rss/RssWriter.py 
b/plugins/granule/rss/RssWriter.py
similarity index 100%
rename from src/main/python/plugins/granule/rss/RssWriter.py
rename to plugins/granule/rss/RssWriter.py
diff --git a/src/main/python/plugins/product_type/iso/__init__.py 
b/plugins/granule/rss/__init__.py
similarity index 100%
rename from src/main/python/plugins/product_type/iso/__init__.py
rename to plugins/granule/rss/__init__.py
diff --git a/src/main/python/plugins/granule/atom/plugin.conf 
b/plugins/granule/rss/plugin.conf
similarity index 100%
rename from src/main/python/plugins/granule/atom/plugin.conf
rename to plugins/granule/rss/plugin.conf
diff --git a/src/main/python/plugins/product_type/atom/__init__.py 
b/plugins/heartbeat/__init__.py
similarity index 100%
rename from src/main/python/plugins/product_type/atom/__init__.py
rename to plugins/heartbeat/__init__.py
diff --git a/src/main/python/plugins/heartbeat/json/Writer.py 
b/plugins/heartbeat/json/Writer.py
similarity index 100%
rename from src/main/python/plugins/heartbeat/json/Writer.py
rename to plugins/heartbeat/json/Writer.py
diff --git a/src/main/python/plugins/product_type/__init__.py 
b/plugins/heartbeat/json/__init__.py
similarity index 100%
rename from src/main/python/plugins/product_type/__init__.py
rename to plugins/heartbeat/json/__init__.py
diff --git a/src/main/python/plugins/heartbeat/json/plugin.conf 
b/plugins/heartbeat/json/plugin.conf
similarity index 100%
rename from src/main/python/plugins/heartbeat/json/plugin.conf
rename to plugins/heartbeat/json/plugin.conf
diff --git a/src/main/python/plugins/productType/atom/__init__.py 
b/plugins/icoads/__init__.py
similarity index 100%
rename from src/main/python/plugins/productType/atom/__init__.py
rename to plugins/icoads/__init__.py
diff --git a/src/main/python/plugins/icoads/json/Writer.py 
b/plugins/icoads/json/Writer.py
similarity index 100%
rename from src/main/python/plugins/icoads/json/Writer.py
rename to plugins/icoads/json/Writer.py
diff --git a/src/main/python/plugins/productType/__init__.py 
b/plugins/icoads/json/__init__.py
similarity index 100%
rename from src/main/python/plugins/productType/__init__.py
rename to plugins/icoads/json/__init__.py
diff --git a/src/main/python/plugins/icoads/json/plugin.conf 
b/plugins/icoads/json/plugin.conf
similarity index 100%
rename from src/main/python/plugins/icoads/json/plugin.conf
rename to plugins/icoads/json/plugin.conf
diff --git a/src/main/python/plugins/icoads/json/template.json 
b/plugins/icoads/json/template.json
similarity index 100%
rename from src/main/python/plugins/icoads/json/template.json
rename to plugins/icoads/json/template.json
diff --git a/src/main/python/plugins/product/iso/__init__.py 
b/plugins/nexus/__init__.py
similarity index 100%
rename from src/main/python/plugins/product/iso/__init__.py
rename to plugins/nexus/__init__.py
diff --git a/src/main/python/plugins/nexus/subsetter/Writer.py 
b/plugins/nexus/climatology/Writer.py
similarity index 100%
rename from src/main/python/plugins/nexus/subsetter/Writer.py
rename to plugins/nexus/climatology/Writer.py
diff --git a/src/main/python/plugins/product/atom/__init__.py 
b/plugins/nexus/climatology/__init__.py
similarity index 100%
rename from src/main/python/plugins/product/atom/__init__.py
rename to plugins/nexus/climatology/__init__.py
diff --git a/src/main/python/plugins/nexus/climatology/plugin.conf 
b/plugins/nexus/climatology/plugin.conf
similarity index 100%
rename from src/main/python/plugins/nexus/climatology/plugin.conf
rename to plugins/nexus/climatology/plugin.conf
diff --git a/src/main/python/plugins/nexus/solr/Writer.py 
b/plugins/nexus/solr/Writer.py
similarity index 100%
rename from src/main/python/plugins/nexus/solr/Writer.py
rename to plugins/nexus/solr/Writer.py
diff --git a/src/main/python/plugins/product/__init__.py 
b/plugins/nexus/solr/__init__.py
similarity index 100%
rename from src/main/python/plugins/product/__init__.py
rename to plugins/nexus/solr/__init__.py
diff --git a/src/main/python/plugins/nexus/solr/plugin.conf 
b/plugins/nexus/solr/plugin.conf
similarity index 100%
rename from src/main/python/plugins/nexus/solr/plugin.conf
rename to plugins/nexus/solr/plugin.conf
diff --git a/src/main/python/plugins/nexus/climatology/Writer.py 
b/plugins/nexus/subsetter/Writer.py
similarity index 100%
rename from src/main/python/plugins/nexus/climatology/Writer.py
rename to plugins/nexus/subsetter/Writer.py
diff --git a/src/main/python/plugins/passthrough/pt/__init__.py 
b/plugins/nexus/subsetter/__init__.py
similarity index 100%
rename from src/main/python/plugins/passthrough/pt/__init__.py
rename to plugins/nexus/subsetter/__init__.py
diff --git a/src/main/python/plugins/nexus/subsetter/plugin.conf 
b/plugins/nexus/subsetter/plugin.conf
similarity index 100%
rename from src/main/python/plugins/nexus/subsetter/plugin.conf
rename to plugins/nexus/subsetter/plugin.conf
diff --git a/src/main/python/plugins/passthrough/__init__.py 
b/plugins/oceanxtremes/__init__.py
similarity index 100%
rename from src/main/python/plugins/passthrough/__init__.py
rename to plugins/oceanxtremes/__init__.py
diff --git a/src/main/python/plugins/oceanxtremes/datacasting/Writer.py 
b/plugins/oceanxtremes/datacasting/Writer.py
similarity index 100%
rename from src/main/python/plugins/oceanxtremes/datacasting/Writer.py
rename to plugins/oceanxtremes/datacasting/Writer.py
diff --git a/src/main/python/plugins/oiip/xml/__init__.py 
b/plugins/oceanxtremes/datacasting/__init__.py
similarity index 100%
rename from src/main/python/plugins/oiip/xml/__init__.py
rename to plugins/oceanxtremes/datacasting/__init__.py
diff --git a/src/main/python/plugins/oceanxtremes/datacasting/plugin.conf 
b/plugins/oceanxtremes/datacasting/plugin.conf
similarity index 100%
rename from src/main/python/plugins/oceanxtremes/datacasting/plugin.conf
rename to plugins/oceanxtremes/datacasting/plugin.conf
diff --git a/src/main/python/plugins/oceanxtremes/datacasting/template.xml 
b/plugins/oceanxtremes/datacasting/template.xml
similarity index 100%
rename from src/main/python/plugins/oceanxtremes/datacasting/template.xml
rename to plugins/oceanxtremes/datacasting/template.xml
diff --git a/src/main/python/plugins/oceanxtremes/post/Writer.py 
b/plugins/oceanxtremes/post/Writer.py
similarity index 100%
rename from src/main/python/plugins/oceanxtremes/post/Writer.py
rename to plugins/oceanxtremes/post/Writer.py
diff --git a/src/main/python/plugins/oiip/json/__init__.py 
b/plugins/oceanxtremes/post/__init__.py
similarity index 100%
rename from src/main/python/plugins/oiip/json/__init__.py
rename to plugins/oceanxtremes/post/__init__.py
diff --git a/src/main/python/plugins/oceanxtremes/post/plugin.conf 
b/plugins/oceanxtremes/post/plugin.conf
similarity index 100%
rename from src/main/python/plugins/oceanxtremes/post/plugin.conf
rename to plugins/oceanxtremes/post/plugin.conf
diff --git a/src/main/python/plugins/oiip/__init__.py b/plugins/oiip/__init__.py
similarity index 100%
rename from src/main/python/plugins/oiip/__init__.py
rename to plugins/oiip/__init__.py
diff --git a/src/main/python/plugins/oiip/json/Writer.py 
b/plugins/oiip/json/Writer.py
similarity index 100%
rename from src/main/python/plugins/oiip/json/Writer.py
rename to plugins/oiip/json/Writer.py
diff --git a/src/main/python/plugins/oceanxtremes/post/__init__.py 
b/plugins/oiip/json/__init__.py
similarity index 100%
rename from src/main/python/plugins/oceanxtremes/post/__init__.py
rename to plugins/oiip/json/__init__.py
diff --git a/src/main/python/plugins/oiip/json/plugin.conf 
b/plugins/oiip/json/plugin.conf
similarity index 100%
rename from src/main/python/plugins/oiip/json/plugin.conf
rename to plugins/oiip/json/plugin.conf
diff --git a/src/main/python/plugins/oiip/json/template.json 
b/plugins/oiip/json/template.json
similarity index 100%
rename from src/main/python/plugins/oiip/json/template.json
rename to plugins/oiip/json/template.json
diff --git a/src/main/python/plugins/oiip/xml/Writer.py 
b/plugins/oiip/xml/Writer.py
similarity index 100%
rename from src/main/python/plugins/oiip/xml/Writer.py
rename to plugins/oiip/xml/Writer.py
diff --git a/src/main/python/plugins/oceanxtremes/datacasting/__init__.py 
b/plugins/oiip/xml/__init__.py
similarity index 100%
rename from src/main/python/plugins/oceanxtremes/datacasting/__init__.py
rename to plugins/oiip/xml/__init__.py
diff --git a/src/main/python/plugins/oiip/xml/plugin.conf 
b/plugins/oiip/xml/plugin.conf
similarity index 100%
rename from src/main/python/plugins/oiip/xml/plugin.conf
rename to plugins/oiip/xml/plugin.conf
diff --git a/src/main/python/plugins/oiip/xml/template.xml 
b/plugins/oiip/xml/template.xml
similarity index 100%
rename from src/main/python/plugins/oiip/xml/template.xml
rename to plugins/oiip/xml/template.xml
diff --git a/src/main/python/plugins/oceanxtremes/__init__.py 
b/plugins/passthrough/__init__.py
similarity index 100%
rename from src/main/python/plugins/oceanxtremes/__init__.py
rename to plugins/passthrough/__init__.py
diff --git a/src/main/python/plugins/passthrough/pt/PassThroughWriter.py 
b/plugins/passthrough/pt/PassThroughWriter.py
similarity index 100%
rename from src/main/python/plugins/passthrough/pt/PassThroughWriter.py
rename to plugins/passthrough/pt/PassThroughWriter.py
diff --git a/src/main/python/plugins/nexus/subsetter/__init__.py 
b/plugins/passthrough/pt/__init__.py
similarity index 100%
rename from src/main/python/plugins/nexus/subsetter/__init__.py
rename to plugins/passthrough/pt/__init__.py
diff --git a/src/main/python/plugins/passthrough/pt/plugin.conf 
b/plugins/passthrough/pt/plugin.conf
similarity index 100%
rename from src/main/python/plugins/passthrough/pt/plugin.conf
rename to plugins/passthrough/pt/plugin.conf
diff --git a/src/main/python/plugins/nexus/solr/__init__.py 
b/plugins/product/__init__.py
similarity index 100%
rename from src/main/python/plugins/nexus/solr/__init__.py
rename to plugins/product/__init__.py
diff --git a/src/main/python/plugins/product/atom/AtomWriter.py 
b/plugins/product/atom/AtomWriter.py
similarity index 100%
rename from src/main/python/plugins/product/atom/AtomWriter.py
rename to plugins/product/atom/AtomWriter.py
diff --git a/src/main/python/plugins/product/atom/Writer.py 
b/plugins/product/atom/Writer.py
similarity index 100%
rename from src/main/python/plugins/product/atom/Writer.py
rename to plugins/product/atom/Writer.py
diff --git a/src/main/python/plugins/nexus/climatology/__init__.py 
b/plugins/product/atom/__init__.py
similarity index 100%
rename from src/main/python/plugins/nexus/climatology/__init__.py
rename to plugins/product/atom/__init__.py
diff --git a/src/main/python/plugins/product/atom/plugin.conf 
b/plugins/product/atom/plugin.conf
similarity index 100%
rename from src/main/python/plugins/product/atom/plugin.conf
rename to plugins/product/atom/plugin.conf
diff --git a/src/main/python/plugins/product/atom/template.xml 
b/plugins/product/atom/template.xml
similarity index 100%
rename from src/main/python/plugins/product/atom/template.xml
rename to plugins/product/atom/template.xml
diff --git a/src/main/python/plugins/product/iso/Writer.py 
b/plugins/product/iso/Writer.py
similarity index 100%
rename from src/main/python/plugins/product/iso/Writer.py
rename to plugins/product/iso/Writer.py
diff --git a/src/main/python/plugins/nexus/__init__.py 
b/plugins/product/iso/__init__.py
similarity index 100%
rename from src/main/python/plugins/nexus/__init__.py
rename to plugins/product/iso/__init__.py
diff --git a/src/main/python/plugins/product/iso/plugin.conf 
b/plugins/product/iso/plugin.conf
similarity index 100%
rename from src/main/python/plugins/product/iso/plugin.conf
rename to plugins/product/iso/plugin.conf
diff --git a/src/main/python/plugins/product/iso/template.xml 
b/plugins/product/iso/template.xml
similarity index 100%
rename from src/main/python/plugins/product/iso/template.xml
rename to plugins/product/iso/template.xml
diff --git a/src/main/python/plugins/icoads/json/__init__.py 
b/plugins/productType/__init__.py
similarity index 100%
rename from src/main/python/plugins/icoads/json/__init__.py
rename to plugins/productType/__init__.py
diff --git a/src/main/python/plugins/productType/atom/AtomWriter.py 
b/plugins/productType/atom/AtomWriter.py
similarity index 100%
rename from src/main/python/plugins/productType/atom/AtomWriter.py
rename to plugins/productType/atom/AtomWriter.py
diff --git a/src/main/python/plugins/icoads/__init__.py 
b/plugins/productType/atom/__init__.py
similarity index 100%
rename from src/main/python/plugins/icoads/__init__.py
rename to plugins/productType/atom/__init__.py
diff --git a/src/main/python/plugins/productType/atom/plugin.conf 
b/plugins/productType/atom/plugin.conf
similarity index 100%
rename from src/main/python/plugins/productType/atom/plugin.conf
rename to plugins/productType/atom/plugin.conf
diff --git a/src/main/python/plugins/heartbeat/json/__init__.py 
b/plugins/product_type/__init__.py
similarity index 100%
rename from src/main/python/plugins/heartbeat/json/__init__.py
rename to plugins/product_type/__init__.py
diff --git a/src/main/python/plugins/product_type/atom/Writer.py 
b/plugins/product_type/atom/Writer.py
similarity index 100%
rename from src/main/python/plugins/product_type/atom/Writer.py
rename to plugins/product_type/atom/Writer.py
diff --git a/src/main/python/plugins/heartbeat/__init__.py 
b/plugins/product_type/atom/__init__.py
similarity index 100%
rename from src/main/python/plugins/heartbeat/__init__.py
rename to plugins/product_type/atom/__init__.py
diff --git a/src/main/python/plugins/product_type/atom/plugin.conf 
b/plugins/product_type/atom/plugin.conf
similarity index 100%
rename from src/main/python/plugins/product_type/atom/plugin.conf
rename to plugins/product_type/atom/plugin.conf
diff --git a/src/main/python/plugins/product_type/atom/template.xml 
b/plugins/product_type/atom/template.xml
similarity index 100%
rename from src/main/python/plugins/product_type/atom/template.xml
rename to plugins/product_type/atom/template.xml
diff --git a/src/main/python/plugins/product_type/iso/Writer.py 
b/plugins/product_type/iso/Writer.py
similarity index 100%
rename from src/main/python/plugins/product_type/iso/Writer.py
rename to plugins/product_type/iso/Writer.py
diff --git a/src/main/python/plugins/granule/rss/__init__.py 
b/plugins/product_type/iso/__init__.py
similarity index 100%
rename from src/main/python/plugins/granule/rss/__init__.py
rename to plugins/product_type/iso/__init__.py
diff --git a/src/main/python/plugins/product_type/iso/plugin.conf 
b/plugins/product_type/iso/plugin.conf
similarity index 100%
rename from src/main/python/plugins/product_type/iso/plugin.conf
rename to plugins/product_type/iso/plugin.conf
diff --git a/src/main/python/plugins/product_type/iso/template.xml 
b/plugins/product_type/iso/template.xml
similarity index 100%
rename from src/main/python/plugins/product_type/iso/template.xml
rename to plugins/product_type/iso/template.xml
diff --git a/src/main/python/plugins/granule/iso/__init__.py 
b/plugins/samos/__init__.py
similarity index 100%
rename from src/main/python/plugins/granule/iso/__init__.py
rename to plugins/samos/__init__.py
diff --git a/src/main/python/plugins/samos/json/Writer.py 
b/plugins/samos/json/Writer.py
similarity index 100%
rename from src/main/python/plugins/samos/json/Writer.py
rename to plugins/samos/json/Writer.py
diff --git a/src/main/python/plugins/granule/fgdc/__init__.py 
b/plugins/samos/json/__init__.py
similarity index 100%
rename from src/main/python/plugins/granule/fgdc/__init__.py
rename to plugins/samos/json/__init__.py
diff --git a/src/main/python/plugins/samos/json/plugin.conf 
b/plugins/samos/json/plugin.conf
similarity index 100%
rename from src/main/python/plugins/samos/json/plugin.conf
rename to plugins/samos/json/plugin.conf
diff --git a/src/main/python/plugins/samos/json/template.json 
b/plugins/samos/json/template.json
similarity index 100%
rename from src/main/python/plugins/samos/json/template.json
rename to plugins/samos/json/template.json
diff --git a/src/main/python/plugins/granule/datacasting/__init__.py 
b/plugins/slcp/__init__.py
similarity index 100%
rename from src/main/python/plugins/granule/datacasting/__init__.py
rename to plugins/slcp/__init__.py
diff --git a/src/main/python/plugins/slcp/atom/Writer.py 
b/plugins/slcp/atom/Writer.py
similarity index 100%
rename from src/main/python/plugins/slcp/atom/Writer.py
rename to plugins/slcp/atom/Writer.py
diff --git a/src/main/python/plugins/granule/atom/__init__.py 
b/plugins/slcp/atom/__init__.py
similarity index 100%
rename from src/main/python/plugins/granule/atom/__init__.py
rename to plugins/slcp/atom/__init__.py
diff --git a/src/main/python/plugins/slcp/atom/plugin.conf 
b/plugins/slcp/atom/plugin.conf
similarity index 100%
rename from src/main/python/plugins/slcp/atom/plugin.conf
rename to plugins/slcp/atom/plugin.conf
diff --git a/src/main/python/plugins/slcp/atom/template.xml 
b/plugins/slcp/atom/template.xml
similarity index 100%
rename from src/main/python/plugins/slcp/atom/template.xml
rename to plugins/slcp/atom/template.xml
diff --git a/src/main/python/plugins/slcp/basin/Writer.py 
b/plugins/slcp/basin/Writer.py
similarity index 100%
rename from src/main/python/plugins/slcp/basin/Writer.py
rename to plugins/slcp/basin/Writer.py
diff --git a/src/main/python/plugins/granule/__init__.py 
b/plugins/slcp/basin/__init__.py
similarity index 100%
rename from src/main/python/plugins/granule/__init__.py
rename to plugins/slcp/basin/__init__.py
diff --git a/src/main/python/plugins/slcp/basin/plugin.conf 
b/plugins/slcp/basin/plugin.conf
similarity index 100%
rename from src/main/python/plugins/slcp/basin/plugin.conf
rename to plugins/slcp/basin/plugin.conf
diff --git a/src/main/python/plugins/slcp/basin/template.json 
b/plugins/slcp/basin/template.json
similarity index 100%
rename from src/main/python/plugins/slcp/basin/template.json
rename to plugins/slcp/basin/template.json
diff --git a/src/main/python/plugins/slcp/content/Writer.py 
b/plugins/slcp/content/Writer.py
similarity index 100%
rename from src/main/python/plugins/slcp/content/Writer.py
rename to plugins/slcp/content/Writer.py
diff --git a/src/main/python/plugins/example/json/__init__.py 
b/plugins/slcp/content/__init__.py
similarity index 100%
rename from src/main/python/plugins/example/json/__init__.py
rename to plugins/slcp/content/__init__.py
diff --git a/src/main/python/plugins/slcp/content/plugin.conf 
b/plugins/slcp/content/plugin.conf
similarity index 100%
rename from src/main/python/plugins/slcp/content/plugin.conf
rename to plugins/slcp/content/plugin.conf
diff --git a/src/main/python/plugins/slcp/content/template.xml 
b/plugins/slcp/content/template.xml
similarity index 100%
rename from src/main/python/plugins/slcp/content/template.xml
rename to plugins/slcp/content/template.xml
diff --git a/src/main/python/plugins/slcp/dat/Writer.py 
b/plugins/slcp/dat/Writer.py
similarity index 100%
rename from src/main/python/plugins/slcp/dat/Writer.py
rename to plugins/slcp/dat/Writer.py
diff --git a/src/main/python/plugins/example/elastic/__init__.py 
b/plugins/slcp/dat/__init__.py
similarity index 100%
rename from src/main/python/plugins/example/elastic/__init__.py
rename to plugins/slcp/dat/__init__.py
diff --git a/src/main/python/plugins/slcp/dat/plugin.conf 
b/plugins/slcp/dat/plugin.conf
similarity index 100%
rename from src/main/python/plugins/slcp/dat/plugin.conf
rename to plugins/slcp/dat/plugin.conf
diff --git a/src/main/python/plugins/slcp/dat/template.json 
b/plugins/slcp/dat/template.json
similarity index 100%
rename from src/main/python/plugins/slcp/dat/template.json
rename to plugins/slcp/dat/template.json
diff --git a/src/main/python/plugins/slcp/echo10/Writer.py 
b/plugins/slcp/echo10/Writer.py
similarity index 100%
rename from src/main/python/plugins/slcp/echo10/Writer.py
rename to plugins/slcp/echo10/Writer.py
diff --git a/src/main/python/plugins/example/__init__.py 
b/plugins/slcp/echo10/__init__.py
similarity index 100%
rename from src/main/python/plugins/example/__init__.py
rename to plugins/slcp/echo10/__init__.py
diff --git a/src/main/python/plugins/slcp/echo10/plugin.conf 
b/plugins/slcp/echo10/plugin.conf
similarity index 100%
rename from src/main/python/plugins/slcp/echo10/plugin.conf
rename to plugins/slcp/echo10/plugin.conf
diff --git a/src/main/python/plugins/slcp/echo10/template.xml 
b/plugins/slcp/echo10/template.xml
similarity index 100%
rename from src/main/python/plugins/slcp/echo10/template.xml
rename to plugins/slcp/echo10/template.xml
diff --git a/src/main/python/plugins/slcp/facet/Writer.py 
b/plugins/slcp/facet/Writer.py
similarity index 100%
rename from src/main/python/plugins/slcp/facet/Writer.py
rename to plugins/slcp/facet/Writer.py
diff --git a/src/main/python/plugins/dataset/rss/__init__.py 
b/plugins/slcp/facet/__init__.py
similarity index 100%
rename from src/main/python/plugins/dataset/rss/__init__.py
rename to plugins/slcp/facet/__init__.py
diff --git a/src/main/python/plugins/slcp/facet/plugin.conf 
b/plugins/slcp/facet/plugin.conf
similarity index 100%
rename from src/main/python/plugins/slcp/facet/plugin.conf
rename to plugins/slcp/facet/plugin.conf
diff --git a/src/main/python/plugins/slcp/facet/template.xml 
b/plugins/slcp/facet/template.xml
similarity index 100%
rename from src/main/python/plugins/slcp/facet/template.xml
rename to plugins/slcp/facet/template.xml
diff --git a/src/main/python/plugins/slcp/granule/Writer.py 
b/plugins/slcp/granule/Writer.py
similarity index 100%
rename from src/main/python/plugins/slcp/granule/Writer.py
rename to plugins/slcp/granule/Writer.py
diff --git a/src/main/python/plugins/dataset/iso/__init__.py 
b/plugins/slcp/granule/__init__.py
similarity index 100%
rename from src/main/python/plugins/dataset/iso/__init__.py
rename to plugins/slcp/granule/__init__.py
diff --git a/src/main/python/plugins/slcp/granule/plugin.conf 
b/plugins/slcp/granule/plugin.conf
similarity index 100%
rename from src/main/python/plugins/slcp/granule/plugin.conf
rename to plugins/slcp/granule/plugin.conf
diff --git a/src/main/python/plugins/slcp/granule/template.xml 
b/plugins/slcp/granule/template.xml
similarity index 100%
rename from src/main/python/plugins/slcp/granule/template.xml
rename to plugins/slcp/granule/template.xml
diff --git a/src/main/python/plugins/slcp/indicator/Writer.py 
b/plugins/slcp/indicator/Writer.py
similarity index 100%
rename from src/main/python/plugins/slcp/indicator/Writer.py
rename to plugins/slcp/indicator/Writer.py
diff --git a/src/main/python/plugins/dataset/gcmd/__init__.py 
b/plugins/slcp/indicator/__init__.py
similarity index 100%
rename from src/main/python/plugins/dataset/gcmd/__init__.py
rename to plugins/slcp/indicator/__init__.py
diff --git a/src/main/python/plugins/slcp/indicator/plugin.conf 
b/plugins/slcp/indicator/plugin.conf
similarity index 100%
rename from src/main/python/plugins/slcp/indicator/plugin.conf
rename to plugins/slcp/indicator/plugin.conf
diff --git a/src/main/python/plugins/slcp/stats/Writer.py 
b/plugins/slcp/stats/Writer.py
similarity index 100%
rename from src/main/python/plugins/slcp/stats/Writer.py
rename to plugins/slcp/stats/Writer.py
diff --git a/src/main/python/plugins/dataset/atom/__init__.py 
b/plugins/slcp/stats/__init__.py
similarity index 100%
rename from src/main/python/plugins/dataset/atom/__init__.py
rename to plugins/slcp/stats/__init__.py
diff --git a/src/main/python/plugins/slcp/stats/plugin.conf 
b/plugins/slcp/stats/plugin.conf
similarity index 100%
rename from src/main/python/plugins/slcp/stats/plugin.conf
rename to plugins/slcp/stats/plugin.conf
diff --git a/src/main/python/plugins/slcp/stats/template.json 
b/plugins/slcp/stats/template.json
similarity index 100%
rename from src/main/python/plugins/slcp/stats/template.json
rename to plugins/slcp/stats/template.json
diff --git a/src/main/python/plugins/slcp/suggest/Writer.py 
b/plugins/slcp/suggest/Writer.py
similarity index 100%
rename from src/main/python/plugins/slcp/suggest/Writer.py
rename to plugins/slcp/suggest/Writer.py
diff --git a/src/main/python/plugins/dataset/__init__.py 
b/plugins/slcp/suggest/__init__.py
similarity index 100%
rename from src/main/python/plugins/dataset/__init__.py
rename to plugins/slcp/suggest/__init__.py
diff --git a/src/main/python/plugins/slcp/suggest/plugin.conf 
b/plugins/slcp/suggest/plugin.conf
similarity index 100%
rename from src/main/python/plugins/slcp/suggest/plugin.conf
rename to plugins/slcp/suggest/plugin.conf
diff --git a/src/main/python/plugins/slcp/umm-json/Writer.py 
b/plugins/slcp/umm-json/Writer.py
similarity index 100%
rename from src/main/python/plugins/slcp/umm-json/Writer.py
rename to plugins/slcp/umm-json/Writer.py
diff --git a/src/main/python/plugins/__init__.py 
b/plugins/slcp/umm-json/__init__.py
similarity index 100%
rename from src/main/python/plugins/__init__.py
rename to plugins/slcp/umm-json/__init__.py
diff --git a/src/main/python/plugins/slcp/umm-json/plugin.conf 
b/plugins/slcp/umm-json/plugin.conf
similarity index 100%
rename from src/main/python/plugins/slcp/umm-json/plugin.conf
rename to plugins/slcp/umm-json/plugin.conf
diff --git a/src/main/python/plugins/slcp/umm-json/template.json 
b/plugins/slcp/umm-json/template.json
similarity index 100%
rename from src/main/python/plugins/slcp/umm-json/template.json
rename to plugins/slcp/umm-json/template.json
diff --git a/src/main/python/libraries/edge/writer/__init__.py 
b/plugins/spurs/__init__.py
similarity index 100%
rename from src/main/python/libraries/edge/writer/__init__.py
rename to plugins/spurs/__init__.py
diff --git a/src/main/python/plugins/spurs2/json/Writer.py 
b/plugins/spurs/json/Writer.py
similarity index 100%
rename from src/main/python/plugins/spurs2/json/Writer.py
rename to plugins/spurs/json/Writer.py
diff --git a/src/main/python/libraries/edge/response/__init__.py 
b/plugins/spurs/json/__init__.py
similarity index 100%
rename from src/main/python/libraries/edge/response/__init__.py
rename to plugins/spurs/json/__init__.py
diff --git a/src/main/python/plugins/spurs/json/plugin.conf 
b/plugins/spurs/json/plugin.conf
similarity index 100%
rename from src/main/python/plugins/spurs/json/plugin.conf
rename to plugins/spurs/json/plugin.conf
diff --git a/src/main/python/plugins/spurs/json/template.json 
b/plugins/spurs/json/template.json
similarity index 100%
rename from src/main/python/plugins/spurs/json/template.json
rename to plugins/spurs/json/template.json
diff --git a/src/main/python/libraries/edge/opensearch/__init__.py 
b/plugins/spurs2/__init__.py
similarity index 100%
rename from src/main/python/libraries/edge/opensearch/__init__.py
rename to plugins/spurs2/__init__.py
diff --git a/src/main/python/plugins/spurs/json/Writer.py 
b/plugins/spurs2/json/Writer.py
similarity index 100%
rename from src/main/python/plugins/spurs/json/Writer.py
rename to plugins/spurs2/json/Writer.py
diff --git 
a/src/main/python/libraries/edge/elasticsearch/opensearch/__init__.py 
b/plugins/spurs2/json/__init__.py
similarity index 100%
rename from src/main/python/libraries/edge/elasticsearch/opensearch/__init__.py
rename to plugins/spurs2/json/__init__.py
diff --git a/src/main/python/plugins/spurs2/json/plugin.conf 
b/plugins/spurs2/json/plugin.conf
similarity index 100%
rename from src/main/python/plugins/spurs2/json/plugin.conf
rename to plugins/spurs2/json/plugin.conf
diff --git a/src/main/python/plugins/spurs2/json/template.json 
b/plugins/spurs2/json/template.json
similarity index 100%
rename from src/main/python/plugins/spurs2/json/template.json
rename to plugins/spurs2/json/template.json
diff --git a/src/main/python/libraries/edge/elasticsearch/__init__.py 
b/plugins/tie/__init__.py
similarity index 100%
rename from src/main/python/libraries/edge/elasticsearch/__init__.py
rename to plugins/tie/__init__.py
diff --git a/src/main/python/plugins/tie/collection/Writer.py 
b/plugins/tie/collection/Writer.py
similarity index 100%
rename from src/main/python/plugins/tie/collection/Writer.py
rename to plugins/tie/collection/Writer.py
diff --git a/src/main/python/libraries/edge/__init__.py 
b/plugins/tie/collection/__init__.py
similarity index 100%
rename from src/main/python/libraries/edge/__init__.py
rename to plugins/tie/collection/__init__.py
diff --git a/src/main/python/plugins/tie/collection/plugin.conf 
b/plugins/tie/collection/plugin.conf
similarity index 100%
rename from src/main/python/plugins/tie/collection/plugin.conf
rename to plugins/tie/collection/plugin.conf
diff --git a/pom.xml b/pom.xml
deleted file mode 100644
index 5fcf32b..0000000
--- a/pom.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- 
-   Copyright 2009, by the California Institute of Technology.
-   ALL RIGHTS RESERVED. United States Government Sponsorship acknowledged.
-   
-   View Parent POM
-   
-   @author Thomas Huang {[email protected]}
-   @version $Id: $
--->
-
-<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";>
-   <modelVersion>4.0.0</modelVersion>
-   <parent>
-      <groupId>gov.nasa.podaac</groupId>
-      <artifactId>podaac</artifactId>
-      <version>0.0.0</version>
-   </parent>
-
-   <groupId>gov.nasa.podaac</groupId>
-   <artifactId>ocsi</artifactId>
-   <version>4.4.1</version>
-   <packaging>pom</packaging>
-
-   <name>OCSI Program Set</name>
-   <description> The OCSI Program Set captures presentation layer
-      implementations.</description>
-   <url>http://podaac-cm.jpl.nasa.gov/docs/ocsi/</url>
-
-   <modules>
-      <!--
-        <module>ghrsst-web</module>
-        <module>portal</module>
-        <module>vodc</module>
-        -->
-   </modules>
-
-   <repositories>
-      <repository>
-         <id>podaac-repo</id>
-         <name>PO.DAAC Repository</name>
-         <url>http://podaac-cm.jpl.nasa.gov/maven2</url>
-         <releases>
-            <updatePolicy>always</updatePolicy>
-            <checksumPolicy>warn</checksumPolicy>
-         </releases>
-         <snapshots>
-            <enabled>false</enabled>
-         </snapshots>
-      </repository>
-   </repositories>
-
-   <build>
-      <plugins>
-         <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-site-plugin</artifactId>
-            <version>2.1.1</version>
-            <dependencies>
-               <dependency>
-                  <groupId>commons-httpclient</groupId>
-                  <artifactId>commons-httpclient</artifactId>
-                  <version>3.1</version>
-                  <exclusions>
-                     <exclusion>
-                        <groupId>commons-logging</groupId>
-                        <artifactId>commons-logging</artifactId>
-                     </exclusion>
-                  </exclusions>
-               </dependency>
-            </dependencies>
-         </plugin>
-      </plugins>
-   </build>
-
-   <reporting>
-      <plugins>
-         <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-project-info-reports-plugin</artifactId>
-            <reportSets>
-               <reportSet>
-                  <reports>
-                     <report>dependencies</report>
-                     <report>summary</report>
-                  </reports>
-               </reportSet>
-            </reportSets>
-         </plugin>
-         <plugin>
-            <artifactId>maven-javadoc-plugin</artifactId>
-         </plugin>
-         <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-surefire-report-plugin</artifactId>
-         </plugin>
-      </plugins>
-   </reporting>
-</project>
diff --git a/src/main/python/requestresponder.py b/requestresponder.py
similarity index 100%
rename from src/main/python/requestresponder.py
rename to requestresponder.py
diff --git a/src/main/python/requirements.txt b/requirements.txt
similarity index 100%
rename from src/main/python/requirements.txt
rename to requirements.txt
diff --git a/src/main/python/server.py b/server.py
similarity index 100%
rename from src/main/python/server.py
rename to server.py
diff --git a/src/main/solr/product/conf/data-config.xml 
b/solr/product/conf/data-config.xml
similarity index 100%
rename from src/main/solr/product/conf/data-config.xml
rename to solr/product/conf/data-config.xml
diff --git a/src/main/solr/product/conf/dataimport.properties 
b/solr/product/conf/dataimport.properties
similarity index 100%
rename from src/main/solr/product/conf/dataimport.properties
rename to solr/product/conf/dataimport.properties
diff --git a/src/main/solr/product/conf/schema.xml 
b/solr/product/conf/schema.xml
similarity index 100%
rename from src/main/solr/product/conf/schema.xml
rename to solr/product/conf/schema.xml
diff --git a/src/main/solr/product/conf/solrconfig.xml 
b/solr/product/conf/solrconfig.xml
similarity index 100%
rename from src/main/solr/product/conf/solrconfig.xml
rename to solr/product/conf/solrconfig.xml
diff --git a/src/main/solr/product_type/conf/data-config.xml 
b/solr/product_type/conf/data-config.xml
similarity index 100%
rename from src/main/solr/product_type/conf/data-config.xml
rename to solr/product_type/conf/data-config.xml
diff --git a/src/main/solr/product_type/conf/dataimport.properties 
b/solr/product_type/conf/dataimport.properties
similarity index 100%
rename from src/main/solr/product_type/conf/dataimport.properties
rename to solr/product_type/conf/dataimport.properties
diff --git a/src/main/solr/product_type/conf/schema.xml 
b/solr/product_type/conf/schema.xml
similarity index 100%
rename from src/main/solr/product_type/conf/schema.xml
rename to solr/product_type/conf/schema.xml
diff --git a/src/main/solr/product_type/conf/solrconfig.xml 
b/solr/product_type/conf/solrconfig.xml
similarity index 100%
rename from src/main/solr/product_type/conf/solrconfig.xml
rename to solr/product_type/conf/solrconfig.xml
diff --git a/src/site/apt/index.apt b/src/site/apt/index.apt
deleted file mode 100644
index 5a22169..0000000
--- a/src/site/apt/index.apt
+++ /dev/null
@@ -1,14 +0,0 @@
-~~ Copyright 2010, by the California Institute of Technology.
-~~ ALL RIGHTS RESERVED. United States Government Sponsorship acknowledged.
-~~
-~~ $Id: $
-
-  ---
-  About OCSI
-  ---
-  Atsuya Takagi
-  ---
-  
-About Oceanographic Common Search Interface
-
-  The OCSI Program Set is the program set for building and accessing 
oceangraphic data through RESTful services.
diff --git a/src/site/apt/install/index.apt b/src/site/apt/install/index.apt
deleted file mode 100644
index bc85151..0000000
--- a/src/site/apt/install/index.apt
+++ /dev/null
@@ -1,144 +0,0 @@
-~~ Copyright 2010, by the California Institute of Technology.
-~~ ALL RIGHTS RESERVED. United States Government Sponsorship acknowledged.
-~~
-~~ $Id: $
-
-  ---
-  Installation
-  ---
-  Atsuya Takagi
-  ---
-
-{Installation}
-
-   This document describes how to install and configure the OCSI program set. 
The following sections can be found in this document:
-
-   * {{{Preparations}Preparations}}
-
-   * {{{Configurations}Configurations}}
-
-
-{Preparations}
-
-   The OCSI program set is using Tornado and it is given that Tornado is 
installed for a target environment. It is assumed that $TORNADO_HOME is where 
Tornado is installed.
-
-   Before running the OCSI program set, bunch of python files need to be 
copied. It is assumed that $OCSI_HOME is where the files are copied to.
-
-+--
-% cp -r src/main/python/* $OCSI_HOME
-+--
-         
-
-{Configurations}
-
-* OCSI
-
-   $OCSI_HOME/config.conf contains server level configuration.
-
-+--
-[server]
-port=8890
-host=localhost
-+--
-
-   "port" is the port number to bind to, and "host" is hostname to bind to.
-
-   $OCSI_HOME/logging.conf contains logging related configuration.
-
-+--
-[handler_timedRotatingFileHandler]
-class=handlers.TimedRotatingFileHandler
-level=DEBUG
-formatter=simpleFormatter
-args=(r'./tornado.log', 'midnight', 1, 30)
-+--
-
-   './tornado.log' can be updated to different log file name if needed. Change 
'level=DEBUG' to appropriate logging level that you are looking for. Setting it 
to be 'ERROR' will reduce significant amount of log messages.
-
-
-* OpenSearch Module for Dataset
-
-   $OCSI_HOME/plugins/dataset/[rss|atom|iso|gcmd]/plugin.conf contains a 
configuration for opensearch module for dataset.
-
-+--
-[solr]
-datasetUrl=http://localhost:8983/solr.war/dataset
-entriesPerPage=7
-
-[portal]
-datasetUrl=http://seastorm:8000/drupal2/dataset
-
-[service]
-url=http://localhost:8890
-+--
-
-   "datasetUrl" under "solr" section points to where solr is running for 
dataset. "entriesPerPage" under "solr" section specifies how many entries are 
included in each opensearch result. "datasetUrl" under "portal" section points 
to the url for each dataset. This is a part of url from drupal. "url" under 
"service" section points to url of itself. This is used to link an entry in 
opensearch result.
-
-
-* OpenSearch Module for Granule
-
-   $OCSI_HOME/plugins/granule/[rss|atom|iso|fgdc]/plugin.conf contains a 
configuration for opensearch module for granule.
-
-+--
-[solr]
-datasetUrl=http://localhost:8983/solr.war/dataset
-granuleUrl=http://localhost:8983/solr.war/granule
-entriesPerPage=7
-
-[service]
-url=http://localhost:8890
-linkToGranule=LOCAL-FTP,REMOTE-FTP
-database=username/password
-+--
-
-   "datasetUrl" under "solr" section points to where solr is running for 
dataset. "granuleUrl" under "solr" section points to where solr is running for 
granule. "entriesPerPage" under "solr" section specifies how many entries are 
included in each opensearch result. "url" under "service" section points to url 
of itself. This is used to link an entry in opensearch result. "linkToGraule" 
is list of comma-separated link types of where granule is located.  Links will 
be checked in same order  [...]
-   
-   $OCSI_HOME/plugins/granule/[atom|rss]/plugin.conf requires "l2" under 
"service" section, which points to where PO.DAAC L2 Search Service is running. 
"bbox" under "service" can be set to "database" or "l2" depending on whether L2 
granule spatial search is to be performed by Oracle or L2 Search Service 
respectively.
-   
-   $OCSI_HOME/plugins/granule/datacasting/plugin.conf requires 
"archivedWithin" under "solr" section. "archivedWithin" is specified in number 
of hours. As an example, if "archivedWithin" is set to 24, then the Datacasting 
feed will publish granules that have been archived within the last 24 hours.
-
-
-* Passthrough Module
-
-   $OCSI_HOME/plugins/passthrough/pt/plugin.conf contains a configuration for 
passthrough module.
-
-+--
-[service]
-allow=localhost,seatorm:8000
-+--
-
-   "allow" specifies a list of domain name and port number that this module is 
allowed to access to.
-
-
-{Libraries}
-
-   OCSI depends on libraries.
-
-
-* Tornado
-
-   Go to http://www.tornadoweb.org/ and install it by following installation 
documentation.
-   
-   The easiest way to install Tornado is to download the file, unarchive it, 
then copy it to $OCSI_HOME/libraries. Do not forget to add the path to 
PYTHONPATH if you installed it this way.
-
-
-* Jinja2
-
-   Go to http://jinja.pocoo.org/docs and install it by following installation 
documentation.
-
-   The easiest way to install Jinja2 is to download the file, unarchive it, 
then copy it to $OCSI_HOME/libraries. Do not forget to add the path to 
PYTHONPATH if you installed it this way.
-
-
-* cx_Oracle
-
-   Go to http://cx-oracle.sourceforge.net/ and install it by following 
installation documentation.
-
-   cx_Oracle consists of C code that actually accesses to Oracle database and 
Python code that provides an API for developers to use to access Oracle 
database. Thus, to install cx_Oracle, you need to compile. However, the site 
provides RPM and SRPM for CentOS, which is binary level compatible Linux 
distribution, so we might be able to compile the SRPM and install the resulted 
RPM for our RHEL. Even better, cx_Oracle could be installed with yum if it is 
already in the list of packages tha [...]
-
-* python-dateutil
-
-   Go to http://pypi.python.org/pypi/python-dateutil and install it by 
following installation documentation.
-
-* PycURL
-
-   Go to http://pycurl.sourceforge.net/ and install version 7.19.0 by 
following installation documentation.
diff --git a/src/site/apt/operate/index.apt b/src/site/apt/operate/index.apt
deleted file mode 100644
index e94d03e..0000000
--- a/src/site/apt/operate/index.apt
+++ /dev/null
@@ -1,344 +0,0 @@
-~~ Copyright 2010, by the California Institute of Technology.
-~~ ALL RIGHTS RESERVED. United States Government Sponsorship acknowledged.
-~~
-~~ $Id: $
-
-  ---
-  Operation
-  ---
-  Atsuya Takagi
-  ---
-  
-Overview
-
-   Operation for the OCSI program set.
-
-
-* OCSI
-
-   To run the OCSI program set, execute following command. It is assumed that 
$TORNADO_HOME is pointing to where Tornado is installed, $JINJA_HOME is where 
jinja2 is installed, and $OCSI_HOME is pointing to where the OCSI program set 
is installed.
-
-+--
-% cd $OCSI_HOME
-% setenv PYTHONPATH $PYTHONPATH:libraries:$TORNADO_HOME:$JINJA_HOME
-% python server.py
-+--
-
-   The command above starts up Tornado with the opensearch module. Use Ctrl+C 
or kill command to terminate the server.
-
-
-* OpenSearch Module for Dataset
-
-   Once the server is started, try to access 
"http://localhost:8890/ws/search/dataset?format=[rss|atom]&search=ocean" for 
example to see if it returns anything. Note that to get RSS feed, access it 
with "format=rss" and "format=atom" for Atom feed.
-
-   * Parameters
-
-      Parameters supported for opensearch are:
-
-      * keyword
-      
-         keyword specifies search text to search for datasets.
-
-      * startTime
-
-         start time in the format of YYYY-MM-DDTHH:mm:ssZ. 'Z' is the 
time-offset, where 'Z' signifies UTC or an actual offset can be used.
-
-      * endTime
-
-         stop time in the format of YYYY-MM-DDTHH:mm:ssZ. 'Z' is the 
time-offset, where 'Z' signifies UTC or an actual offset can be used.
-
-      * startIndex
-
-         start index of entries found for search.
-
-      * itemsPerPage
-
-         number of results per page for opensearch result.
-
-      * datasetId
-
-         dataset persistent ID.
-
-      * shortName
-
-         dataset shortname.
-
-      * instrument
-
-         dataset instrument.
-
-      * satellite
-
-         dataset satellite.
-
-      * fileFormat
-
-         dataset data format e.g. HDF, NetCDF.
-
-      * status
-
-         dataset status; only OPEN, PREVIEW, SIMULATED, REMOTE is supported.
-
-      * processLevel
-
-         dataset processing level e.g. 1, 2P.
-
-      * pretty
-
-         "true" to enable pretty output for xml.
-
-      * format
-
-         response format. Possible values are: atom, rss. If format is not 
specified, default response format is atom.
-
-      * sortBy
-
-         determines ordering of response. Possible values are: timeAsc, 
timeDesc, popularityAsc, popularityDesc. If sortBy is not specified, default 
sort order is by Apache Solr's score (most relevant dataset first).
-
-      * bbox
-
-        bounding box for spatial search. format should look like 
"bbox=0.0,-45.0,180.0,40.0" which is in order of west, south, east, north. 
Longitude values needs to be in range of [-180.0,180.0].
-
-      * full
-
-        "true" to return response with complete PO.DAAC metadata per entry.
-
-   * Examples
-   
-      * To search dataset that matches a term ocean (RSS)
-      
-         * curl -X GET 
"http://localhost:8890/ws/search/dataset?format=rss&keyword=ocean";
-
-      * To search dataset that matches a term ocean (Atom)
-      
-         * curl -X GET 
"http://localhost:8890/ws/search/dataset?format=atom&keyword=ocean";
-
-
-* OpenSearch Module for Granule
-
-   Once the server is started, try to access 
"http://localhost:8890/ws/search/granule?format=[rss|atom]&datasetId=PODAAC-GH16G-2PE01"
 for example to see if it returns anything. Note that to get RSS feed, access 
it with "format=rss" and "format=atom" for Atom feed.
-
-   * Parameters
-
-      Parameters supported for opensearch are:
-
-      * keyword
-      
-         search specifies search text to search for granules.
-
-      * startTime
-
-         lower bound for the granule start time in the format of 
YYYY-MM-DDTHH:mm:ssZ. 'Z' is the time-offset, where 'Z' signifies UTC or an 
actual offset can be used.
-
-      * endTime
-
-         upper bound for the granule start time in the format of 
YYYY-MM-DDTHH:mm:ssZ. 'Z' is the time-offset, where 'Z' signifies UTC or an 
actual offset can be used.
-
-      * startIndex
-
-         start index of entries found for search.
-
-      * itemsPerPage
-
-         number of results per page for opensearch result.
-
-      * datasetId
-
-         dataset persistent ID.
-
-      * shortName
-
-         dataset shortname.
-
-      * granuleName
-
-         granule name.
-
-      * pretty
-
-        "true" to enable pretty output for xml.
-
-      * bbox
-
-        bounding box for spatial search. format should look like 
"bbox=0.0,-45.0,190.0,40.0" which is in order of west, south, east, north. 
Longitude values needs to be in range of [-180.0,180.0].
-
-      * format
-
-         response format. Possible values are: atom, rss. If format is not 
specified, default response format is atom.
-
-      * sortBy
-
-         determines ordering of response. Possible values are: timeAsc, 
timeDesc. If sortBy is not specified, default sort order is timeDesc.
-
-      * full
-
-        "true" to return response with complete PO.DAAC metadata per entry.
-
-      Note that either datasetId or shortName must be specified.
-
-   * Examples
-   
-      * To search granules in dataset with persistent ID "PODAAC-GHMG2-2PO01" 
from start time of Dec 1 00:00:00 UTC 2010 to start time of Dec 2 23:59:59 UTC 
2010 (RSS)
-      
-         * curl -X GET 
"http://localhost:8890/ws/search/granule?format=rss&datasetId=PODAAC-GHMG2-2PO01&startTime=2010-12-01T00:00:00Z&endTime=2010-12-02T23:59:59Z";
-
-      * To search granules in dataset with persistent ID "PODAAC-GHMG2-2PO01" 
from start time of Dec 1 00:00:00 UTC 2010 to start time of Dec 2 23:59:59 UTC 
2010 (Atom)
-      
-         * curl -X GET 
"http://localhost:8890/ws/search/granule?format=atom&datasetId=PODAAC-GHMG2-2PO01&startTime=2010-12-01T00:00:00Z&endTime=2010-12-02T23:59:59Z";
-
-      * To search granules in dataset with persistent ID "PODAAC-GHAMS-2PE01" 
which intersects bounding box of 0.0, -45.0, 180.0, 40.0 (RSS) 
-      
-         * curl -X GET 
"http://localhost:8890/ws/search/granule?format=rss&datasetId=PODAAC-GHAMS-2PE01&bbox=0.0,-45.0,180.0,40.0";
-
-      * To search granules in dataset with persistent ID "PODAAC-GHAMS-2PE01" 
which intersects bounding box of 0.0, -45.0, 180.0, 40.0 (Atom) 
-      
-         * curl -X GET 
"http://localhost:8890/ws/search/granule?format=atom&datasetId=PODAAC-GHAMS-2PE01&boundingBox=0.0,-45.0,180.0,40.0";
-
-
-* ISO 19115 and GCMD DIF for Dataset
-
-   To retrieve an ISO 19115/GCMD DIF record for a given dataset, access 
"http://localhost:8890/ws/metadata/dataset?format=[iso|gcmd]&datasetId=[dataset 
persistent ID]" Note that to get ISO format, access it with "format=iso" and 
"format=gcmd" for GCMD DIF format.
-
-   * Parameters
-
-      Parameters supported for ISO 19115/GCMD DIF are:
-
-      * datasetId
-
-         dataset persistent ID.
-
-      * shortName
-
-         dataset shortname.
-
-      * allowNone
-
-         Parameter supported for GCMD DIF only. "true" to allow DIF elements 
with n/a, none or null values. Default is "false".
-
-   * Examples
-
-      * To retrieve the GCMD DIF record for dataset with persistent ID 
"PODAAC-GHMG2-2PO01"
-
-         * curl -X GET 
"http://localhost:8890/ws/metadata/dataset?format=gcmd&datasetId=PODAAC-GHMG2-2PO01";
-
-      * To retrieve the GCMD DIF record for dataset with shortname 
"OSDPD-L2P-MSG02"
-      
-         * curl -X GET 
"http://localhost:8890/ws/metadata/dataset?format=gcmd&shortName=OSDPD-L2P-MSG02";
-
-      * To retrieve the ISO 19115 record for dataset with persistent ID 
"PODAAC-GHMG2-2PO01"
-
-         * curl -X GET 
"http://localhost:8890/ws/metadata/dataset?format=iso&datasetId=PODAAC-GHMG2-2PO01";
-
-      * To retrieve the ISO 19115 record for dataset with shortname 
"OSDPD-L2P-MSG02"
-      
-         * curl -X GET 
"http://localhost:8890/ws/metadata/dataset?format=iso&shortName=OSDPD-L2P-MSG02";
-
-
-* ISO 19115 for Granule
-
-   To retrieve an ISO 19115 record for a given granule, access 
"http://localhost:8890/ws/metadata/granule?format=iso&name=[granule name]"
-
-   * Parameters
-
-      Parameters supported for ISO 19115 are:
-
-      * datasetId
-
-         dataset persistent ID.
-
-      * shortName
-
-         dataset shortname.
-
-      * granuleName
-
-         granule name.
-
-   * Examples
-   
-      * To retrieve the ISO 19115 record for granule 
"20100309-MODIS_A-JPL-L2P-A2010068015500.L2_LAC_GHRSST_N-v01.nc" belonging to 
dataset with persistent ID "PODAAC-GHMDA-2PJ01"
-      
-         * curl -X GET 
"http://localhost:8890/ws/metadata/granule?format=iso&datasetId=PODAAC-GHMDA-2PJ01&granuleName=20100309-MODIS_A-JPL-L2P-A2010068015500.L2_LAC_GHRSST_N-v01.nc";
-
-
-* FGDC for Granule
-
-   To retrieve an FGDC record, access 
"http://localhost:8890/ws/metadata/granule?format=fgdc"; and in addition provide 
the following parameters:
-
-   * Parameters
-
-      Parameters supported for FGDC are:
-
-      * itemsPerPage
-
-         number of granules to return for FGDC record.
-
-      * datasetId
-
-         dataset persistent ID.
-
-      * shortName
-
-         dataset shortname.
-
-      * granuleName
-
-         granule name.
-
-      * startTime
-
-         lower bound for the granule start time in the format of 
YYYY-MM-DDTHH:mm:ssZ. 'Z' is the time-offset, where 'Z' signifies UTC or an 
actual offset can be used.
-
-      * endTime
-
-         upper bound for the granule start time time in the format of 
YYYY-MM-DDTHH:mm:ssZ. 'Z' is the time-offset, where 'Z' signifies UTC or an 
actual offset can be used.
-
-      * sortBy
-
-         determines ordering of response. Possible values are: timeAsc, 
timeDesc. If sortBy is not specified, default sort order is timeDesc.
-
-   * Examples
-
-      * To retrieve the FGDC record for granules with start time between Feb 1 
00:00:00 UTC 2011 to Feb 1 23:59:59 UTC 2011 for dataset with shortname 
"JPL-L2P-MODIS_A"
-
-         * curl -X GET 
"http://localhost:8890/ws/metadata/granule?format=fgdc&shortName=JPL-L2P-MODIS_A&startTime=2011-02-01T00:00:00Z&endTime=2011-02-01T23:59:59Z&itemsPerPage=500";
-
-           Note that numberOfResults parameter is set to 500, which means at 
most 500 granules will be returned for the single FGDC record.
-
-* Datacasting for Granule
-
-   To retrieve a Datacasting feed, access 
"http://localhost:8890/ws/metadata/granule?format=datacasting"; and in addition 
provide the following parameters:
-
-   * Parameters
-
-      Parameters supported for Datacasting are:
-
-      * datasetId
-
-         dataset persistent ID.
-
-      * shortName
-
-         dataset shortname.
-
-      * pretty
-
-        "true" to enable pretty output for xml. Default is "true".
-
-   * Examples
-
-      * To retrieve the Datacasting feed of granules belonging to dataset with 
shortname "JPL-L2P-MODIS_A"
-
-         * curl -X GET 
"http://localhost:8890/ws/metadata/granule?format=datacasting&shortName=JPL-L2P-MODIS_A";
-
-* Passthrough Module
-
-   Once the server is started, try to access 
"http://localhost:8890/passthrough/p.pt?url=http://google.com/"; for example to 
see if it returns anything.
-
-   * Parameters
-
-      Parameters supported for opensearch are:
-
-      * url
-
-         url to fetch the response from.
diff --git a/src/site/apt/release/index-2.2.1.apt 
b/src/site/apt/release/index-2.2.1.apt
deleted file mode 100644
index 4e8a2f3..0000000
--- a/src/site/apt/release/index-2.2.1.apt
+++ /dev/null
@@ -1,73 +0,0 @@
-~~ Copyright 2010, by the California Institute of Technology.
-~~ ALL RIGHTS RESERVED. United States Government Sponsorship acknowledged.
-~~
-~~ $Id:$
-
-  ---
-  Release Description 2.2.1
-  ---
-  Thomas Huang
-  ---
-  
-Release Description 2.2.1
-
-  This release of the initial release of the OCSI Program Set. This release is 
NOT intended as an operational release. The following sections can be found in 
this document:
-
-  * {{{Capabilities}Capabilities}}
-
-  * {{{Liens}Liens}}
-
-  * {{{System_Requirements}System Requirements}}
-
-
-{Capabilities}
-
-  This section details the new, modified and corrected capabilities that 
comprise this release of the OCSI Program Set. In lieu of listing the 
capabilities by requirement they have been summarized. For a complete list of 
the requirements and their support status, see 
{{{Appendix_A_-_Requirements_Support}Appendix A}}.
-
-* New Capabilities
-
-   * A framework that makes it easy to implements a web service is developed. 
The framework is written in Python and using Tornado.
-
-   * An OpenSearch implementation using the framework is developed. The 
OpenSearch implementation allows users to search for datasets.
-
-* Modified Capabilities
-
-   * None.
-
-* Corrected Capabilities
-
-   * None 
-
-
-{Liens}
-
-  This section details the liens against the capabilities that have yet to be 
implemented or are partially implemented. In lieu of listing the liens by 
requirement they have been summarized. For a complete list of the requirements 
and their support status, see {{{Appendix_A_-_Requirements_Support}Appendix A}}.
-
-  There are no liens for this release.
-
-
-{System Requirements}
-
-  The software contained in this program set was written in Python and will 
run on any platform with Python enabled environment. The software was 
specifically developed under Python 2.6.x or 2.7.x and has only been tested 
with this version.
-
-  * PO.DAAC Standard Computing Environment
-
-  This will eventually be documented on the Wiki and linked to in future 
releases. For now, the following software and tools should be available in the 
current environment:
-
-    * Apache Maven 2.2.x
-
-    * Subversion Client 1.4.X
-    
-    * Python 2.6.x or 2.7.x
-
-    * Tornado 1.1
-
-    []
-
-    See the system-level {{{../../cm/release/index-2.2.1.html}release}} 
document for specific version numbers.
-
-
-{Appendix A - Requirements Support}
-
-  TBD
-
diff --git a/src/site/apt/release/index-3.0.0.apt 
b/src/site/apt/release/index-3.0.0.apt
deleted file mode 100644
index 891b7d4..0000000
--- a/src/site/apt/release/index-3.0.0.apt
+++ /dev/null
@@ -1,71 +0,0 @@
-~~ Copyright 2010, by the California Institute of Technology.
-~~ ALL RIGHTS RESERVED. United States Government Sponsorship acknowledged.
-~~
-~~ $Id:$
-
-  ---
-  Release Description 3.0.0 
-  ---
-  Thomas Huang
-  ---
-  
-Release Description 3.0.0
-
-  This release of the initial release of the OCSI Program Set. This release is 
NOT intended as an operational release. The following sections can be found in 
this document:
-
-  * {{{Capabilities}Capabilities}}
-
-  * {{{Liens}Liens}}
-
-  * {{{System_Requirements}System Requirements}}
-
-
-{Capabilities}
-
-  This section details the new, modified and corrected capabilities that 
comprise this release of the OCSI Program Set. In lieu of listing the 
capabilities by requirement they have been summarized. For a complete list of 
the requirements and their support status, see 
{{{Appendix_A_-_Requirements_Support}Appendix A}}.
-
-* New Capabilities
-
-   * Open search for granule.
-
-* Modified Capabilities
-
-   * None.
-
-* Corrected Capabilities
-
-   * None 
-
-
-{Liens}
-
-  This section details the liens against the capabilities that have yet to be 
implemented or are partially implemented. In lieu of listing the liens by 
requirement they have been summarized. For a complete list of the requirements 
and their support status, see {{{Appendix_A_-_Requirements_Support}Appendix A}}.
-
-  There are no liens for this release.
-
-
-{System Requirements}
-
-  The software contained in this program set was written in Python and will 
run on any platform with Python enabled environment. The software was 
specifically developed under Python 2.6.x or 2.7.x and has only been tested 
with this version.
-
-  * PO.DAAC Standard Computing Environment
-
-  This will eventually be documented on the Wiki and linked to in future 
releases. For now, the following software and tools should be available in the 
current environment:
-
-    * Apache Maven 2.2.x
-
-    * Subversion Client 1.4.X
-    
-    * Python 2.6.x or 2.7.x
-
-    * Tornado 1.1
-
-    []
-
-    See the system-level {{{../../cm/release/index-3.0.0.html}release}} 
document for specific version numbers.
-
-
-{Appendix A - Requirements Support}
-
-  TBD
-
diff --git a/src/site/apt/release/index-3.1.0.apt 
b/src/site/apt/release/index-3.1.0.apt
deleted file mode 100644
index e242ba0..0000000
--- a/src/site/apt/release/index-3.1.0.apt
+++ /dev/null
@@ -1,81 +0,0 @@
-~~ Copyright 2010, by the California Institute of Technology.
-~~ ALL RIGHTS RESERVED. United States Government Sponsorship acknowledged.
-~~
-~~ $Id:$
-
-  ---
-  Release Description 3.1.0 
-  ---
-  Thomas Huang
-  ---
-  
-Release Description 3.1.0
-
-  This release of the initial release of the OCSI Program Set. This release is 
NOT intended as an operational release. The following sections can be found in 
this document:
-
-  * {{{Capabilities}Capabilities}}
-
-  * {{{Liens}Liens}}
-
-  * {{{System_Requirements}System Requirements}}
-
-
-{Capabilities}
-
-  This section details the new, modified and corrected capabilities that 
comprise this release of the OCSI Program Set. In lieu of listing the 
capabilities by requirement they have been summarized. For a complete list of 
the requirements and their support status, see 
{{{Appendix_A_-_Requirements_Support}Appendix A}}.
-
-* New Capabilities
-
-   * ISO 19115-2 support for dataset.
-   
-   * Spatial search for granules (bouding box).
-   
-   * Atom feed for opensearch response.
-
-   * Prettify support for xml response.
-
-* Modified Capabilities
-
-   * None.
-
-* Corrected Capabilities
-
-   * None 
-
-
-{Liens}
-
-  This section details the liens against the capabilities that have yet to be 
implemented or are partially implemented. In lieu of listing the liens by 
requirement they have been summarized. For a complete list of the requirements 
and their support status, see {{{Appendix_A_-_Requirements_Support}Appendix A}}.
-
-  There are no liens for this release.
-
-
-{System Requirements}
-
-  The software contained in this program set was written in Python and will 
run on any platform with Python enabled environment. The software was 
specifically developed under Python 2.6.x or 2.7.x and has only been tested 
with this version.
-
-  * PO.DAAC Standard Computing Environment
-
-  This will eventually be documented on the Wiki and linked to in future 
releases. For now, the following software and tools should be available in the 
current environment:
-
-    * Apache Maven 2.2.x
-
-    * Subversion Client 1.4.X
-    
-    * Python 2.6.x or 2.7.x
-
-    * Tornado 1.2.1
-    
-    * Jinja2 2.5.5 (Template engine for python)
-
-    * cx_Oracle 5.1 (Python DB API implementation for python)
-
-    []
-
-    See the system-level {{{../../cm/release/index-3.1.0.html}release}} 
document for specific version numbers.
-
-
-{Appendix A - Requirements Support}
-
-  TBD
-
diff --git a/src/site/apt/release/index-3.1.1.apt 
b/src/site/apt/release/index-3.1.1.apt
deleted file mode 100644
index f9797fa..0000000
--- a/src/site/apt/release/index-3.1.1.apt
+++ /dev/null
@@ -1,89 +0,0 @@
-~~ Copyright 2010, by the California Institute of Technology.
-~~ ALL RIGHTS RESERVED. United States Government Sponsorship acknowledged.
-~~
-~~ $Id:$
-
-  ---
-  Release Description 3.1.1 
-  ---
-  Thomas Huang
-  ---
-  
-Release Description 3.1.1
-
-  This release of the initial release of the OCSI Program Set. This release is 
NOT intended as an operational release. The following sections can be found in 
this document:
-
-  * {{{Capabilities}Capabilities}}
-
-  * {{{Liens}Liens}}
-
-  * {{{System_Requirements}System Requirements}}
-
-
-{Capabilities}
-
-  This section details the new, modified and corrected capabilities that 
comprise this release of the OCSI Program Set. In lieu of listing the 
capabilities by requirement they have been summarized. For a complete list of 
the requirements and their support status, see 
{{{Appendix_A_-_Requirements_Support}Appendix A}}.
-
-* New Capabilities
-
-   * ISO 19115-2 support for granule.
-   
-   * GCMD DIF support for dataset.
-   
-   * Added new search parameters for dataset (instrument, satellite, format, 
status, processingLevel).
-
-* Modified Capabilities
-
-   * Updated ISO 19115-2 response for dataset.
-   
-   * Changed search parameters (keyword, startTime, endTime, numberOfResults, 
boundingBox).
-   
-   * Date time parameters take ISO 8601 format.
-
-   * Added Connection: close header to HTTP request.
-
-* Corrected Capabilities
-
-   * {{{https://podaac-cm/trac/ticket/1025}1025}} - Granule search result 
shows online link.
-   
-   * Search returns only OPEN, PREVIEW, RETIRED, and SIMULATED datasets and 
granules. This fix has been merged to 3.1.0 release.
-
-
-{Liens}
-
-  This section details the liens against the capabilities that have yet to be 
implemented or are partially implemented. In lieu of listing the liens by 
requirement they have been summarized. For a complete list of the requirements 
and their support status, see {{{Appendix_A_-_Requirements_Support}Appendix A}}.
-
-  There are no liens for this release.
-
-
-{System Requirements}
-
-  The software contained in this program set was written in Python and will 
run on any platform with Python enabled environment. The software was 
specifically developed under Python 2.6.x or 2.7.x and has only been tested 
with this version.
-
-  * PO.DAAC Standard Computing Environment
-
-  This will eventually be documented on the Wiki and linked to in future 
releases. For now, the following software and tools should be available in the 
current environment:
-
-    * Apache Maven 2.2.x
-
-    * Subversion Client 1.4.X
-    
-    * Python 2.6.x or 2.7.x
-
-    * Tornado 1.2.1
-    
-    * Jinja2 2.5.5 (Template engine for python)
-
-    * cx_Oracle 5.1 (Python DB API implementation for python)
-    
-    * python-dateutil 1.5 (Extensions to the standard python 2.3+ datetime 
module)
-
-    []
-
-    See the system-level {{{../../cm/release/index-3.1.1.html}release}} 
document for specific version numbers.
-
-
-{Appendix A - Requirements Support}
-
-  TBD
-
diff --git a/src/site/apt/release/index-3.2.0.apt 
b/src/site/apt/release/index-3.2.0.apt
deleted file mode 100644
index 2b1558d..0000000
--- a/src/site/apt/release/index-3.2.0.apt
+++ /dev/null
@@ -1,79 +0,0 @@
-~~ Copyright 2010, by the California Institute of Technology.
-~~ ALL RIGHTS RESERVED. United States Government Sponsorship acknowledged.
-~~
-~~ $Id:$
-
-  ---
-  Release Description 3.2.0 
-  ---
-  Thomas Huang
-  ---
-  
-Release Description 3.2.0
-
-  This release of the initial release of the OCSI Program Set. This release is 
NOT intended as an operational release. The following sections can be found in 
this document:
-
-  * {{{Capabilities}Capabilities}}
-
-  * {{{Liens}Liens}}
-
-  * {{{System_Requirements}System Requirements}}
-
-
-{Capabilities}
-
-  This section details the new, modified and corrected capabilities that 
comprise this release of the OCSI Program Set. In lieu of listing the 
capabilities by requirement they have been summarized. For a complete list of 
the requirements and their support status, see 
{{{Appendix_A_-_Requirements_Support}Appendix A}}.
-
-* New Capabilities
-
-   * {{{https://podaac-cm/trac/ticket/1083}Trac-1083}} - FGDC creation support.
-
-* Modified Capabilities
-
-   * {{{https://podaac-cm/trac/ticket/1084}Trac-1084}} - Support for 
persistent ID.
-
-   * {{{https://podaac-cm/trac/ticket/1094}Trac-1094}} - Case-insensitive 
search on format, status, and processingLevel parameter.
-
-* Corrected Capabilities
-
-   * None
-
-
-{Liens}
-
-  This section details the liens against the capabilities that have yet to be 
implemented or are partially implemented. In lieu of listing the liens by 
requirement they have been summarized. For a complete list of the requirements 
and their support status, see {{{Appendix_A_-_Requirements_Support}Appendix A}}.
-
-  There are no liens for this release.
-
-
-{System Requirements}
-
-  The software contained in this program set was written in Python and will 
run on any platform with Python enabled environment. The software was 
specifically developed under Python 2.6.x or 2.7.x and has only been tested 
with this version.
-
-  * PO.DAAC Standard Computing Environment
-
-  This will eventually be documented on the Wiki and linked to in future 
releases. For now, the following software and tools should be available in the 
current environment:
-
-    * Apache Maven 2.2.x
-
-    * Subversion Client 1.4.X
-    
-    * Python 2.6.x or 2.7.x
-
-    * Tornado 1.2.1
-    
-    * Jinja2 2.5.5 (Template engine for python)
-
-    * cx_Oracle 5.1 (Python DB API implementation for python)
-    
-    * python-dateutil 1.5 (Extensions to the standard python 2.3+ datetime 
module)
-
-    []
-
-    See the system-level {{{../../cm/release/index-3.2.0.html}release}} 
document for specific version numbers.
-
-
-{Appendix A - Requirements Support}
-
-  TBD
-
diff --git a/src/site/apt/release/index-3.2.1.apt 
b/src/site/apt/release/index-3.2.1.apt
deleted file mode 100644
index d274df0..0000000
--- a/src/site/apt/release/index-3.2.1.apt
+++ /dev/null
@@ -1,79 +0,0 @@
-~~ Copyright 2010, by the California Institute of Technology.
-~~ ALL RIGHTS RESERVED. United States Government Sponsorship acknowledged.
-~~
-~~ $Id:$
-
-  ---
-  Release Description 3.2.1 
-  ---
-  Thomas Huang
-  ---
-  
-Release Description 3.2.1
-
-  This release of the initial release of the OCSI Program Set. This release is 
NOT intended as an operational release. The following sections can be found in 
this document:
-
-  * {{{Capabilities}Capabilities}}
-
-  * {{{Liens}Liens}}
-
-  * {{{System_Requirements}System Requirements}}
-
-
-{Capabilities}
-
-  This section details the new, modified and corrected capabilities that 
comprise this release of the OCSI Program Set. In lieu of listing the 
capabilities by requirement they have been summarized. For a complete list of 
the requirements and their support status, see 
{{{Appendix_A_-_Requirements_Support}Appendix A}}.
-
-* New Capabilities
-
-   * None
-
-* Modified Capabilities
-
-   * {{{https://podaac-cm/trac/ticket/1144}Trac-1144}} - Return only granule 
name and link to granule metadata in OpenSearch response for bounding box 
search.
-
-* Corrected Capabilities
-
-   * {{{https://podaac-cm/trac/ticket/1145}Trac-1145}} - Sort granules in FGDC 
and ISO response by start time to prevent solr out of memory error.
-
-   * {{{https://podaac-cm/trac/ticket/1146}Trac-1146}} - Update DTD link in 
FGDC response to fix Internet Explorer error.
-
-
-{Liens}
-
-  This section details the liens against the capabilities that have yet to be 
implemented or are partially implemented. In lieu of listing the liens by 
requirement they have been summarized. For a complete list of the requirements 
and their support status, see {{{Appendix_A_-_Requirements_Support}Appendix A}}.
-
-  There are no liens for this release.
-
-
-{System Requirements}
-
-  The software contained in this program set was written in Python and will 
run on any platform with Python enabled environment. The software was 
specifically developed under Python 2.6.x or 2.7.x and has only been tested 
with this version.
-
-  * PO.DAAC Standard Computing Environment
-
-  This will eventually be documented on the Wiki and linked to in future 
releases. For now, the following software and tools should be available in the 
current environment:
-
-    * Apache Maven 2.2.x
-
-    * Subversion Client 1.4.X
-    
-    * Python 2.6.x or 2.7.x
-
-    * Tornado 1.2.1
-    
-    * Jinja2 2.5.5 (Template engine for python)
-
-    * cx_Oracle 5.1 (Python DB API implementation for python)
-    
-    * python-dateutil 1.5 (Extensions to the standard python 2.3+ datetime 
module)
-
-    []
-
-    See the system-level {{{../../cm/release/index-3.2.1.html}release}} 
document for specific version numbers.
-
-
-{Appendix A - Requirements Support}
-
-  TBD
-
diff --git a/src/site/apt/release/index-3.2.2.apt 
b/src/site/apt/release/index-3.2.2.apt
deleted file mode 100644
index 12584b1..0000000
--- a/src/site/apt/release/index-3.2.2.apt
+++ /dev/null
@@ -1,81 +0,0 @@
-~~ Copyright 2010, by the California Institute of Technology.
-~~ ALL RIGHTS RESERVED. United States Government Sponsorship acknowledged.
-~~
-~~ $Id:$
-
-  ---
-  Release Description 3.2.2 
-  ---
-  Thomas Huang
-  ---
-  
-Release Description 3.2.2
-
-  This release of the initial release of the OCSI Program Set. This release is 
NOT intended as an operational release. The following sections can be found in 
this document:
-
-  * {{{Capabilities}Capabilities}}
-
-  * {{{Liens}Liens}}
-
-  * {{{System_Requirements}System Requirements}}
-
-
-{Capabilities}
-
-  This section details the new, modified and corrected capabilities that 
comprise this release of the OCSI Program Set. In lieu of listing the 
capabilities by requirement they have been summarized. For a complete list of 
the requirements and their support status, see 
{{{Appendix_A_-_Requirements_Support}Appendix A}}.
-
-* New Capabilities
-
-   * None
-
-* Modified Capabilities
-
-   * {{{https://podaac-cm/trac/ticket/1214}Trac-1214}} - Capped number of 
results for OCSI response.
-
-   * {{{https://podaac-cm/trac/ticket/1231}Trac-1231}} - Modified OpenSearch 
response.
-
-* Corrected Capabilities
-
-   * {{{https://podaac-cm/trac/ticket/1174}Trac-1174}} - Fixed dataset 
temporal search to return all datasets that have total or partial overlap.
-
-   * {{{https://podaac-cm/trac/ticket/1233}Trac-1233}} - Fixed dataset missing 
optional GCMD DIF field should not return 404 page with error.
-
-
-{Liens}
-
-  This section details the liens against the capabilities that have yet to be 
implemented or are partially implemented. In lieu of listing the liens by 
requirement they have been summarized. For a complete list of the requirements 
and their support status, see {{{Appendix_A_-_Requirements_Support}Appendix A}}.
-
-  There are no liens for this release.
-
-
-{System Requirements}
-
-  The software contained in this program set was written in Python and will 
run on any platform with Python enabled environment. The software was 
specifically developed under Python 2.6.x or 2.7.x and has only been tested 
with this version.
-
-  * PO.DAAC Standard Computing Environment
-
-  This will eventually be documented on the Wiki and linked to in future 
releases. For now, the following software and tools should be available in the 
current environment:
-
-    * Apache Maven 2.2.x
-
-    * Subversion Client 1.4.X
-    
-    * Python 2.6.x or 2.7.x
-
-    * Tornado 1.2.1
-    
-    * Jinja2 2.5.5 (Template engine for python)
-
-    * cx_Oracle 5.1 (Python DB API implementation for python)
-    
-    * python-dateutil 1.5 (Extensions to the standard python 2.3+ datetime 
module)
-
-    []
-
-    See the system-level {{{../../cm/release/index-3.2.2.html}release}} 
document for specific version numbers.
-
-
-{Appendix A - Requirements Support}
-
-  TBD
-
diff --git a/src/site/apt/release/index-3.3.0.apt 
b/src/site/apt/release/index-3.3.0.apt
deleted file mode 100644
index 9b76618..0000000
--- a/src/site/apt/release/index-3.3.0.apt
+++ /dev/null
@@ -1,81 +0,0 @@
-~~ Copyright 2010, by the California Institute of Technology.
-~~ ALL RIGHTS RESERVED. United States Government Sponsorship acknowledged.
-~~
-~~ $Id:$
-
-  ---
-  Release Description 3.3.0 
-  ---
-  Thomas Huang
-  ---
-  
-Release Description 3.3.0
-
-  This release of the initial release of the OCSI Program Set. This release is 
NOT intended as an operational release. The following sections can be found in 
this document:
-
-  * {{{Capabilities}Capabilities}}
-
-  * {{{Liens}Liens}}
-
-  * {{{System_Requirements}System Requirements}}
-
-
-{Capabilities}
-
-  This section details the new, modified and corrected capabilities that 
comprise this release of the OCSI Program Set. In lieu of listing the 
capabilities by requirement they have been summarized. For a complete list of 
the requirements and their support status, see 
{{{Appendix_A_-_Requirements_Support}Appendix A}}.
-
-* New Capabilities
-
-   * None
-
-* Modified Capabilities
-
-   * {{{https://podaac-cm/trac/ticket/1245}Trac-1245}} - Revised OpenSearch 
response and interface.
-
-* Corrected Capabilities
-
-   * {{{https://podaac-cm/trac/ticket/1268}Trac-1268}} - Fixed evaluation of 
opensearch temporal query.
-
-   * {{{https://podaac-cm/trac/ticket/1283}Trac-1283}} - Fixed blocking issue 
when making requests to external data services.
-
-
-{Liens}
-
-  This section details the liens against the capabilities that have yet to be 
implemented or are partially implemented. In lieu of listing the liens by 
requirement they have been summarized. For a complete list of the requirements 
and their support status, see {{{Appendix_A_-_Requirements_Support}Appendix A}}.
-
-  There are no liens for this release.
-
-
-{System Requirements}
-
-  The software contained in this program set was written in Python and will 
run on any platform with Python enabled environment. The software was 
specifically developed under Python 2.6.x or 2.7.x and has only been tested 
with this version.
-
-  * PO.DAAC Standard Computing Environment
-
-  This will eventually be documented on the Wiki and linked to in future 
releases. For now, the following software and tools should be available in the 
current environment:
-
-    * Apache Maven 2.2.x
-
-    * Subversion Client 1.4.X
-    
-    * Python 2.6.x or 2.7.x
-
-    * Tornado 1.2.1
-    
-    * Jinja2 2.5.5 (Template engine for python)
-
-    * cx_Oracle 5.1 (Python DB API implementation for python)
-    
-    * python-dateutil 1.5 (Extensions to the standard python 2.3+ datetime 
module)
-
-    * PycURL 7.19.0 (Python interface to libcurl)
-
-    []
-
-    See the system-level {{{../../cm/release/index-3.3.0.html}release}} 
document for specific version numbers.
-
-
-{Appendix A - Requirements Support}
-
-  TBD
-
diff --git a/src/site/apt/release/index-4.0.0.apt 
b/src/site/apt/release/index-4.0.0.apt
deleted file mode 100644
index f22e6bd..0000000
--- a/src/site/apt/release/index-4.0.0.apt
+++ /dev/null
@@ -1,79 +0,0 @@
-~~ Copyright 2010, by the California Institute of Technology.
-~~ ALL RIGHTS RESERVED. United States Government Sponsorship acknowledged.
-~~
-~~ $Id:$
-
-  ---
-  Release Description 4.0.0 
-  ---
-  Thomas Huang
-  ---
-  
-Release Description 4.0.0
-
-  This release of the OCSI Program Set is a component of the integrated 
release ({{{../../cm/release/index-4.0.0.html}4.0.0}}) of the PO.DAAC System. 
This release is intended as an operational release. The following sections can 
be found in this document:
-
-  * {{{Capabilities}Capabilities}}
-
-  * {{{Liens}Liens}}
-
-  * {{{System_Requirements}System Requirements}}
-
-
-{Capabilities}
-
-  This section details the new, modified and corrected capabilities that 
comprise this release of the OCSI Program Set. In lieu of listing the 
capabilities by requirement they have been summarized. For a complete list of 
the requirements and their support status, see 
{{{Appendix_A_-_Requirements_Support}Appendix A}}.
-
-* New Capabilities
-
-   * None
-
-* Modified Capabilities
-
-   * None
-
-* Corrected Capabilities
-
-   * None
-
-
-{Liens}
-
-  This section details the liens against the capabilities that have yet to be 
implemented or are partially implemented. In lieu of listing the liens by 
requirement they have been summarized. For a complete list of the requirements 
and their support status, see {{{Appendix_A_-_Requirements_Support}Appendix A}}.
-
-  There are no liens for this release.
-
-
-{System Requirements}
-
-  The software contained in this program set was written in Python and will 
run on any platform with Python enabled environment. The software was 
specifically developed under Python 2.6.x or 2.7.x and has only been tested 
with this version.
-
-  * PO.DAAC Standard Computing Environment
-
-  This will eventually be documented on the Wiki and linked to in future 
releases. For now, the following software and tools should be available in the 
current environment:
-
-    * Apache Maven 2.2.x
-
-    * Subversion Client 1.4.X
-    
-    * Python 2.6.x or 2.7.x
-
-    * Tornado 1.2.1
-    
-    * Jinja2 2.5.5 (Template engine for python)
-
-    * cx_Oracle 5.1 (Python DB API implementation for python)
-    
-    * python-dateutil 1.5 (Extensions to the standard python 2.3+ datetime 
module)
-
-    * PycURL 7.19.0 (Python interface to libcurl)
-
-    []
-
-    See the system-level {{{../../cm/release/index-4.0.0.html}release}} 
document for specific version numbers.
-
-
-{Appendix A - Requirements Support}
-
-  TBD
-
diff --git a/src/site/apt/release/index-4.1.0.apt 
b/src/site/apt/release/index-4.1.0.apt
deleted file mode 100644
index 441ed8f..0000000
--- a/src/site/apt/release/index-4.1.0.apt
+++ /dev/null
@@ -1,79 +0,0 @@
-~~ Copyright 2010, by the California Institute of Technology.
-~~ ALL RIGHTS RESERVED. United States Government Sponsorship acknowledged.
-~~
-~~ $Id:$
-
-  ---
-  Release Description 4.1.0 
-  ---
-  Thomas Huang
-  ---
-  
-Release Description 4.1.0
-
-  This release of the OCSI Program Set is a component of the integrated 
release ({{{../../cm/release/index-4.1.0.html}4.1.0}}) of the PO.DAAC System. 
This release is intended as an operational release. The following sections can 
be found in this document:
-
-  * {{{Capabilities}Capabilities}}
-
-  * {{{Liens}Liens}}
-
-  * {{{System_Requirements}System Requirements}}
-
-
-{Capabilities}
-
-  This section details the new, modified and corrected capabilities that 
comprise this release of the OCSI Program Set. In lieu of listing the 
capabilities by requirement they have been summarized. For a complete list of 
the requirements and their support status, see 
{{{Appendix_A_-_Requirements_Support}Appendix A}}.
-
-* New Capabilities
-
-   * None
-
-* Modified Capabilities
-
-   * {{{https://podaac-cm/trac/ticket/1353}Trac-1353}} - Modified OpenSearch 
response to return Granule Search link only if dataset has granules and Dataset 
Information link only if dataset can be viewed via web portal.
-
-* Corrected Capabilities
-
-   * None
-
-
-{Liens}
-
-  This section details the liens against the capabilities that have yet to be 
implemented or are partially implemented. In lieu of listing the liens by 
requirement they have been summarized. For a complete list of the requirements 
and their support status, see {{{Appendix_A_-_Requirements_Support}Appendix A}}.
-
-  There are no liens for this release.
-
-
-{System Requirements}
-
-  The software contained in this program set was written in Python and will 
run on any platform with Python enabled environment. The software was 
specifically developed under Python 2.6.x or 2.7.x and has only been tested 
with this version.
-
-  * PO.DAAC Standard Computing Environment
-
-  This will eventually be documented on the Wiki and linked to in future 
releases. For now, the following software and tools should be available in the 
current environment:
-
-    * Apache Maven 2.2.x
-
-    * Subversion Client 1.4.X
-    
-    * Python 2.6.x or 2.7.x
-
-    * Tornado 1.2.1
-    
-    * Jinja2 2.5.5 (Template engine for python)
-
-    * cx_Oracle 5.1 (Python DB API implementation for python)
-    
-    * python-dateutil 1.5 (Extensions to the standard python 2.3+ datetime 
module)
-
-    * PycURL 7.19.0 (Python interface to libcurl)
-
-    []
-
-    See the system-level {{{../../cm/release/index-4.1.0.html}release}} 
document for specific version numbers.
-
-
-{Appendix A - Requirements Support}
-
-  TBD
-
diff --git a/src/site/apt/release/index-4.2.0.apt 
b/src/site/apt/release/index-4.2.0.apt
deleted file mode 100644
index 8b5c3a4..0000000
--- a/src/site/apt/release/index-4.2.0.apt
+++ /dev/null
@@ -1,79 +0,0 @@
-~~ Copyright 2010, by the California Institute of Technology.
-~~ ALL RIGHTS RESERVED. United States Government Sponsorship acknowledged.
-~~
-~~ $Id:$
-
-  ---
-  Release Description 4.2.0 
-  ---
-  Thomas Huang
-  ---
-  
-Release Description 4.2.0
-
-  This release of the OCSI Program Set is a component of the integrated 
release ({{{../../cm/release/index-4.2.0.html}4.2.0}}) of the PO.DAAC System. 
This release is intended as an operational release. The following sections can 
be found in this document:
-
-  * {{{Capabilities}Capabilities}}
-
-  * {{{Liens}Liens}}
-
-  * {{{System_Requirements}System Requirements}}
-
-
-{Capabilities}
-
-  This section details the new, modified and corrected capabilities that 
comprise this release of the OCSI Program Set. In lieu of listing the 
capabilities by requirement they have been summarized. For a complete list of 
the requirements and their support status, see 
{{{Appendix_A_-_Requirements_Support}Appendix A}}.
-
-* New Capabilities
-
-   * None
-
-* Modified Capabilities
-
-   * None
-
-* Corrected Capabilities
-
-   * None
-
-
-{Liens}
-
-  This section details the liens against the capabilities that have yet to be 
implemented or are partially implemented. In lieu of listing the liens by 
requirement they have been summarized. For a complete list of the requirements 
and their support status, see {{{Appendix_A_-_Requirements_Support}Appendix A}}.
-
-  There are no liens for this release.
-
-
-{System Requirements}
-
-  The software contained in this program set was written in Python and will 
run on any platform with Python enabled environment. The software was 
specifically developed under Python 2.6.x or 2.7.x and has only been tested 
with this version.
-
-  * PO.DAAC Standard Computing Environment
-
-  This will eventually be documented on the Wiki and linked to in future 
releases. For now, the following software and tools should be available in the 
current environment:
-
-    * Apache Maven 2.2.x
-
-    * Subversion Client 1.4.X
-    
-    * Python 2.6.x or 2.7.x
-
-    * Tornado 1.2.1
-    
-    * Jinja2 2.5.5 (Template engine for python)
-
-    * cx_Oracle 5.1 (Python DB API implementation for python)
-    
-    * python-dateutil 1.5 (Extensions to the standard python 2.3+ datetime 
module)
-
-    * PycURL 7.19.0 (Python interface to libcurl)
-
-    []
-
-    See the system-level {{{../../cm/release/index-4.2.0.html}release}} 
document for specific version numbers.
-
-
-{Appendix A - Requirements Support}
-
-  TBD
-
diff --git a/src/site/apt/release/index-4.3.0.apt 
b/src/site/apt/release/index-4.3.0.apt
deleted file mode 100644
index 3acbc4a..0000000
--- a/src/site/apt/release/index-4.3.0.apt
+++ /dev/null
@@ -1,77 +0,0 @@
-~~ Copyright 2010, by the California Institute of Technology.
-~~ ALL RIGHTS RESERVED. United States Government Sponsorship acknowledged.
-~~
-~~ $Id:$
-
-  ---
-  Release Description 4.3.0 
-  ---
-  Thomas Huang
-  ---
-  
-Release Description 4.3.0
-
-  This release of the OCSI Program Set is intended as an operational release. 
The following sections can be found in this document:
-
-  * {{{Capabilities}Capabilities}}
-
-  * {{{Liens}Liens}}
-
-  * {{{System_Requirements}System Requirements}}
-
-
-{Capabilities}
-
-  This section details the new, modified and corrected capabilities that 
comprise this release of the OCSI Program Set. In lieu of listing the 
capabilities by requirement they have been summarized. For a complete list of 
the requirements and their support status, see 
{{{Appendix_A_-_Requirements_Support}Appendix A}}.
-
-* New Capabilities
-
-   * None
-
-* Modified Capabilities
-
-   * {{{https://podaac-cm/trac/ticket/1508}Trac-1508}} - Remove "N/A" and 
"none" entries from OCSI GCMD interface.
-
-* Corrected Capabilities
-
-   * {{{https://podaac-cm/trac/ticket/1590}Trac-1590}} - Fix output error on 
ampersand symbol.
-
-
-{Liens}
-
-  This section details the liens against the capabilities that have yet to be 
implemented or are partially implemented. In lieu of listing the liens by 
requirement they have been summarized. For a complete list of the requirements 
and their support status, see {{{Appendix_A_-_Requirements_Support}Appendix A}}.
-
-  There are no liens for this release.
-
-
-{System Requirements}
-
-  The software contained in this program set was written in Python and will 
run on any platform with Python enabled environment. The software was 
specifically developed under Python 2.6.x or 2.7.x and has only been tested 
with this version.
-
-  * PO.DAAC Standard Computing Environment
-
-  This will eventually be documented on the Wiki and linked to in future 
releases. For now, the following software and tools should be available in the 
current environment:
-
-    * Apache Maven 2.2.x
-
-    * Subversion Client 1.4.X
-    
-    * Python 2.6.x or 2.7.x
-
-    * Tornado 1.2.1
-    
-    * Jinja2 2.5.5 (Template engine for python)
-
-    * cx_Oracle 5.1 (Python DB API implementation for python)
-    
-    * python-dateutil 1.5 (Extensions to the standard python 2.3+ datetime 
module)
-
-    * PycURL 7.19.0 (Python interface to libcurl)
-
-    []
-
-
-{Appendix A - Requirements Support}
-
-  TBD
-
diff --git a/src/site/apt/release/index-4.4.0.apt 
b/src/site/apt/release/index-4.4.0.apt
deleted file mode 100644
index c713a97..0000000
--- a/src/site/apt/release/index-4.4.0.apt
+++ /dev/null
@@ -1,78 +0,0 @@
-~~ Copyright 2010, by the California Institute of Technology.
-~~ ALL RIGHTS RESERVED. United States Government Sponsorship acknowledged.
-~~
-~~ $Id:$
-
-  ---
-  Release Description 4.4.0 
-  ---
-  Thomas Huang
-  ---
-  
-Release Description 4.4.0
-
-  This release of the OCSI Program Set is intended as an operational release. 
The following sections can be found in this document:
-
-  * {{{Capabilities}Capabilities}}
-
-  * {{{Liens}Liens}}
-
-  * {{{System_Requirements}System Requirements}}
-
-
-{Capabilities}
-
-  This section details the new, modified and corrected capabilities that 
comprise this release of the OCSI Program Set. In lieu of listing the 
capabilities by requirement they have been summarized. For a complete list of 
the requirements and their support status, see 
{{{Appendix_A_-_Requirements_Support}Appendix A}}.
-
-* New Capabilities
-
-   * {{{https://podaac-cm/trac/ticket/1550}Trac-1550}} - OCSI Datacasting Feed 
Creation
-   * {{{https://podaac-cm/trac/ticket/1614}Trac-1614}} - OCSI datacasting feed 
shall include FTP and OPeNDAP links as custom elements
-
-* Modified Capabilities
-
-   * {{{https://podaac-cm/trac/ticket/1572}Trac-1572}} - Web services should 
return the same results as the PO.DAAC portal
-
-* Corrected Capabilities
-
-   * None
-
-
-{Liens}
-
-  This section details the liens against the capabilities that have yet to be 
implemented or are partially implemented. In lieu of listing the liens by 
requirement they have been summarized. For a complete list of the requirements 
and their support status, see {{{Appendix_A_-_Requirements_Support}Appendix A}}.
-
-  There are no liens for this release.
-
-
-{System Requirements}
-
-  The software contained in this program set was written in Python and will 
run on any platform with Python enabled environment. The software was 
specifically developed under Python 2.6.x or 2.7.x and has only been tested 
with this version.
-
-  * PO.DAAC Standard Computing Environment
-
-  This will eventually be documented on the Wiki and linked to in future 
releases. For now, the following software and tools should be available in the 
current environment:
-
-    * Apache Maven 2.2.x
-
-    * Subversion Client 1.4.X
-    
-    * Python 2.6.x or 2.7.x
-
-    * Tornado 1.2.1
-    
-    * Jinja2 2.5.5 (Template engine for python)
-
-    * cx_Oracle 5.1 (Python DB API implementation for python)
-    
-    * python-dateutil 1.5 (Extensions to the standard python 2.3+ datetime 
module)
-
-    * PycURL 7.19.0 (Python interface to libcurl)
-
-    []
-
-
-{Appendix A - Requirements Support}
-
-  TBD
-
diff --git a/src/site/apt/release/index-4.4.1.apt 
b/src/site/apt/release/index-4.4.1.apt
deleted file mode 100644
index c940ffc..0000000
--- a/src/site/apt/release/index-4.4.1.apt
+++ /dev/null
@@ -1,79 +0,0 @@
-~~ Copyright 2010, by the California Institute of Technology.
-~~ ALL RIGHTS RESERVED. United States Government Sponsorship acknowledged.
-~~
-~~ $Id:$
-
-  ---
-  Release Description 4.4.1 
-  ---
-  Thomas Huang
-  ---
-  
-Release Description 4.4.1
-
-  This release of the OCSI Program Set is intended as an operational release. 
The following sections can be found in this document:
-
-  * {{{Capabilities}Capabilities}}
-
-  * {{{Liens}Liens}}
-
-  * {{{System_Requirements}System Requirements}}
-
-
-{Capabilities}
-
-  This section details the new, modified and corrected capabilities that 
comprise this release of the OCSI Program Set. In lieu of listing the 
capabilities by requirement they have been summarized. For a complete list of 
the requirements and their support status, see 
{{{Appendix_A_-_Requirements_Support}Appendix A}}.
-
-* New Capabilities
-
-   * None
-
-* Modified Capabilities
-
-   * {{{https://podaac-cm/trac/ticket/1869}Trac-1869}} - Modified dataset 
temporal range search to return true if there is any overlap
-
-* Corrected Capabilities
-
-   * {{{https://podaac-cm/trac/ticket/1790}Trac-1790}} - Fixed mapping for 
GCMD DIF Data_Center
-
-   * {{{https://podaac-cm/trac/ticket/1827}Trac-1827}} - Added Personnel to 
GCMD DIF with DIF AUTHOR Role
-
-
-{Liens}
-
-  This section details the liens against the capabilities that have yet to be 
implemented or are partially implemented. In lieu of listing the liens by 
requirement they have been summarized. For a complete list of the requirements 
and their support status, see {{{Appendix_A_-_Requirements_Support}Appendix A}}.
-
-  There are no liens for this release.
-
-
-{System Requirements}
-
-  The software contained in this program set was written in Python and will 
run on any platform with Python enabled environment. The software was 
specifically developed under Python 2.6.x or 2.7.x and has only been tested 
with this version.
-
-  * PO.DAAC Standard Computing Environment
-
-  This will eventually be documented on the Wiki and linked to in future 
releases. For now, the following software and tools should be available in the 
current environment:
-
-    * Apache Maven 2.2.x
-
-    * Subversion Client 1.4.X
-    
-    * Python 2.6.x or 2.7.x
-
-    * Tornado 1.2.1
-    
-    * Jinja2 2.5.5 (Template engine for python)
-
-    * cx_Oracle 5.1 (Python DB API implementation for python)
-    
-    * python-dateutil 1.5 (Extensions to the standard python 2.3+ datetime 
module)
-
-    * PycURL 7.19.0 (Python interface to libcurl)
-
-    []
-
-
-{Appendix A - Requirements Support}
-
-  TBD
-
diff --git a/src/site/apt/release/index.apt b/src/site/apt/release/index.apt
deleted file mode 100644
index afff6fa..0000000
--- a/src/site/apt/release/index.apt
+++ /dev/null
@@ -1,101 +0,0 @@
-~~ Copyright 2010, by the California Institute of Technology.
-~~ ALL RIGHTS RESERVED. United States Government Sponsorship acknowledged.
-~~
-~~ $Id: $
-
-  ---
-  Release Description
-  ---
-  Atsuya Takagi
-  ---
-  
-Release Description
-
-  The Release Description Documents (RDDs) detail the new and modified 
capabilities that comprise a particular OCSI Program Set release.
-
-* Release History
-
-  * Version: {{{./index-4.4.1.html}4.4.1}}
-
-    * Date: 2013-10-24
-
-    * Description: This release of OCSI Program Set is intended as an 
operational release.
-
-  * Version: {{{./index-4.4.0.html}4.4.0}}
-
-    * Date: 2013-02-13
-
-    * Description: This release of OCSI Program Set is intended as an 
operational release.
-
-  * Version: {{{./index-4.3.0.html}4.3.0}}
-
-    * Date: 2012-12-03
-
-    * Description: This release of OCSI Program Set is intended as an 
operational release.
-
-  * Version: {{{./index-4.2.0.html}4.2.0}}
-
-    * Date: 2012-08-31
-
-    * Description: This release of OCSI Program Set is a component of the 
integrated release ({{{./index-4.2.0.html}4.2.0}}) of the PO.DAAC System.
-
-  * Version: {{{./index-4.1.0.html}4.1.0}}
-
-    * Date: 2012-06-08
-
-    * Description: This release of OCSI Program Set is a component of the 
integrated release ({{{./index-4.1.0.html}4.1.0}}) of the PO.DAAC System.
-
-  * Version: {{{./index-4.0.0.html}4.0.0}}
-
-    * Date: 2012-03-14
-
-    * Description: This release of OCSI Program Set is a component of the 
integrated release ({{{./index-4.0.0.html}4.0.0}}) of the PO.DAAC System.
-
-  * Version: {{{./index-3.3.0.html}3.3.0}}
-
-    * Date: 2012-01-20
-
-    * Description: This release adds modifications to opensearch response and 
interface to enable integration with L2 Granule Search Service.
-
-  * Version: {{{./index-3.2.2.html}3.2.2}}
-
-    * Date: 2011-11-23
-
-    * Description: This release adds modifications to opensearch response, 
changes how dataset temporal query is evaluated, and caps number of results.
-
-  * Version: {{{./index-3.2.1.html}3.2.1}}
-
-    * Date: 2011-09-30
-
-    * Description: This release adds modifications to opensearch response for 
bounding box search, FGDC response to conform to DTD and granules sort order in 
FGDC and ISO response.
-
-  * Version: {{{./index-3.2.0.html}3.2.0}}
-
-    * Date: 2011-08-19
-
-    * Description: This release adds FGDC creation support for exporting 
granules, support for persistent ID, and case-insensitive search on format, 
status, and processingLevel parameter.
-
-  * Version: {{{./index-3.1.1.html}3.1.1}}
-
-    * Date: 2011-06-02
-
-    * Description: This release adds ISO support for granule, GCMD DIF support 
for dataset, and new dataset search parameters.
-    
-  * Version: {{{./index-3.1.0.html}3.1.0}}
-
-    * Date: 2011-04-05
-
-    * Description: This release adds ISO and spatial search support.
-
-  * Version: {{{./index-3.0.0.html}3.0.0}}
-
-    * Date: 2011-01-27
-
-    * Description: This release adds open search support for granules.
-
-  * Version: {{{./index-2.2.1.html}2.2.1}}
-
-    * Date: 2010-11-15
-
-    * Description: This release of the initial release of the OCSI Program 
Set. This release is NOT intended as an operational release.
-
diff --git a/src/site/resources/images/podaac_logo.jpg 
b/src/site/resources/images/podaac_logo.jpg
deleted file mode 100644
index abb1063..0000000
Binary files a/src/site/resources/images/podaac_logo.jpg and /dev/null differ
diff --git a/src/site/site.xml b/src/site/site.xml
deleted file mode 100644
index b8ca679..0000000
--- a/src/site/site.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-
-<!-- 
-  Copyright 2009, by the California Institute of Technology.
-  ALL RIGHTS RESERVED. United States Government Sponsorship acknowledged.
-
-  $Id: $
--->
-
-<project name="OCSI Program Set">
-  <bannerLeft>
-    <src>images/podaac_logo.jpg</src>
-    <href>http://podaac-cm.jpl.nasa.gov/</href>
-  </bannerLeft>
-
-  <bannerRight>
-    <name>Oceanographic Common Search Interface Program Set&nbsp;&nbsp;</name>
-  </bannerRight>
-
-  <body>
-    <links>
-      <item name="OCSI" 
href="http://podaac-cm.jpl.nasa.gov/docs/ocsi/index.html"; />
-    </links>
-
-    <menu name="Software Documentation">
-      <item name="About OCSI" href="index.html"/>
-      <item name="Release Description" href="release/index.html"/>
-      <item name="Installation" href="install/index.html"/>
-      <item name="Operation" href="operate/index.html"/>
-    </menu>
-
-    <menu ref="modules"/>
-
-    <menu ref="reports"/>
-  </body>
-</project>
diff --git a/src/main/python/templates/podaac-dataset-osd.xml 
b/templates/podaac-dataset-osd.xml
similarity index 100%
rename from src/main/python/templates/podaac-dataset-osd.xml
rename to templates/podaac-dataset-osd.xml
diff --git a/src/main/python/templates/podaac-granule-osd.xml 
b/templates/podaac-granule-osd.xml
similarity index 100%
rename from src/main/python/templates/podaac-granule-osd.xml
rename to templates/podaac-granule-osd.xml

Reply via email to