diff --git a/Instrument/CDPP-AMDA/PSP/Ephemeris.xml b/Instrument/CDPP-AMDA/PSP/Ephemeris.xml
deleted file mode 100644
index 53487c2..0000000
--- a/Instrument/CDPP-AMDA/PSP/Ephemeris.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Spase xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.spase-group.org/data/schema" xsi:schemaLocation="http://www.spase-group.org/data/schema http://www.spase-group.org/data/schema/spase-2_3_1.xsd">
-  <Version>2.3.1</Version>
-  <Instrument>
-    <ResourceID>spase://CNES/Instrument/CDPP-AMDA/PSP/Ephemeris</ResourceID>
-    <ResourceHeader>
-      <ResourceName>Ephemeris</ResourceName>
-      <AlternateName>Positions</AlternateName> 
-      <ReleaseDate>2018-05-20T21:10:13Z</ReleaseDate>
-      <Description>Parker Solar Probe Spacecraft Ephemeris</Description>
-      <Contact>      
-        <PersonID>spase://SMWG/Person/James.M.Weygand</PersonID>
-        <Role>MetadataContact</Role>
-      </Contact>
-    </ResourceHeader>
-    <InstrumentType>Platform</InstrumentType>
-    <InvestigationName/>
-    <ObservatoryID>spase://CNES/Observatory/CDPP-AMDA/PSP</ObservatoryID>
-  </Instrument>
-</Spase>
diff --git a/Instrument/CDPP-AMDA/PSP/ORBIT.xml b/Instrument/CDPP-AMDA/PSP/ORBIT.xml
new file mode 100644
index 0000000..5205401
--- /dev/null
+++ b/Instrument/CDPP-AMDA/PSP/ORBIT.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Spase xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.spase-group.org/data/schema" xsi:schemaLocation="http://www.spase-group.org/data/schema http://www.spase-group.org/data/schema/spase-2_3_1.xsd">
+  <Version>2.3.1</Version>
+  <Instrument>
+    <ResourceID>spase://CNES/Instrument/CDPP-AMDA/PSP/ORBIT</ResourceID>
+    <ResourceHeader>
+      <ResourceName>Orbit</ResourceName>
+      <AlternateName>Ephemeris</AlternateName> 
+      <ReleaseDate>2018-05-20T21:10:13Z</ReleaseDate>
+      <Description>Parker Solar Probe Spacecraft Ephemeris</Description>
+      <Contact>      
+        <PersonID>spase://SMWG/Person/James.M.Weygand</PersonID>
+        <Role>MetadataContact</Role>
+      </Contact>
+    </ResourceHeader>
+    <InstrumentType>Platform</InstrumentType>
+    <InvestigationName/>
+    <ObservatoryID>spase://CNES/Observatory/CDPP-AMDA/PSP</ObservatoryID>
+  </Instrument>
+</Spase>
diff --git a/NumericalData/CDPP-AMDA/PSP/Ephemeris/spp-orb-all.xml b/NumericalData/CDPP-AMDA/PSP/Ephemeris/spp-orb-all.xml
deleted file mode 100644
index 744a060..0000000
--- a/NumericalData/CDPP-AMDA/PSP/Ephemeris/spp-orb-all.xml
+++ /dev/null
@@ -1,178 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Spase xmlns="http://www.spase-group.org/data/schema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.spase-group.org/data/schema http://www.spase-group.org/data/schema/spase-2_3_1.xsd">
-   <Version>2.3.1</Version>
-   <NumericalData>
-      <ResourceID>spase://CNES/NumericalData/CDPP-AMDA/PSP/ephemeris/spp-orb-all</ResourceID>
-      <ResourceHeader>
-         <ResourceName>orbit</ResourceName>
-         <AlternateName>Parker Solar Probe orbit</AlternateName>
-         <ReleaseDate>2018-10-12T10:48:29Z</ReleaseDate> 
-         <Description></Description>
-         <Contact>
-            <PersonID>spase://CNES/Person/NAIF</PersonID>
-            <Role>PrincipalInvestigator</Role>
-         </Contact>
-         <InformationURL>
-            <Name>Parker Solar Probe Mission Web Page, JPL</Name>
-            <URL>http://parkersolarprobe.jhuapl.edu/</URL>                        
-            <Description>Parker Solar Probe Mission Web Page, NASA Jet Propulsion Laboratory, JPL</Description>
-         </InformationURL>
-      </ResourceHeader>       
-      <AccessInformation>
-         <RepositoryID>spase://SMWG/Repository/CNES/CDPP-AMDA</RepositoryID>
-         <Availability>Online</Availability>
-         <AccessRights>Open</AccessRights>
-         <AccessURL>
-            <Name>AMDA at CDPP</Name>
-            <URL>http://amda.cdpp.eu</URL>
-         </AccessURL>
-         <Format>Text</Format>
-         <Acknowledgement>           
-         </Acknowledgement>
-      </AccessInformation>
-   <ProviderName>NASA</ProviderName>
-    <ProviderResourceName>
-       * spp_nom_20180812_20250831_v034_RO1_TCM1.bsp
-    </ProviderResourceName>
-      <InstrumentID>spase://CNES/Instrument/CDPP-AMDA/PSP/Ephemeris</InstrumentID>
-      <MeasurementType>Ephemeris</MeasurementType>
-      <TemporalDescription>
-         <TimeSpan>
-             <StartDate>2018-08-13T00:00:00Z</StartDate>
-             <StopDate>2025-08-30T22:00:00Z</StopDate>
-         </TimeSpan>
-      <Cadence>PT1H</Cadence></TemporalDescription>
-      <ObservedRegion>Heliosphere</ObservedRegion>
-      <Caveats>
-      </Caveats>    
-<Parameter>
-   <Name>xyz_iau_sun</Name>
-   <ParameterKey>spp_all_xyz</ParameterKey>
-   <Description/>
-   <Ucd/>
-   <Units>AU</Units>
-   <UnitsConversion/>
-   <Structure>
-      <Size>3</Size>
-      <Element>
-         <Name>x</Name>
-         <Index>1</Index>
-         <ParameterKey>spp_all_xyz(0)</ParameterKey>
-         <ValidMin/>
-         <ValidMax/>
-         <FillValue/>
-      </Element>
-      <Element>
-         <Name>y</Name>
-         <Index>2</Index>
-         <ParameterKey>spp_all_xyz(1)</ParameterKey>
-         <ValidMin/>
-         <ValidMax/>
-         <FillValue/>
-      </Element>
-      <Element>
-         <Name>z</Name>
-         <Index>3</Index>
-         <ParameterKey>spp_all_xyz(2)</ParameterKey>
-         <ValidMin/>
-         <ValidMax/>
-         <FillValue/>
-      </Element>
-   </Structure>
-</Parameter>
-      <Parameter>
-         <Name>distance psp-sun</Name>
-         <ParameterKey>spp_all_r</ParameterKey>
-         <Description/>
-         <Ucd/>
-         <Units>AU</Units>
-         <UnitsConversion/>
-      </Parameter>
-      <Parameter>
-         <Name>lon iau_sun</Name>
-         <ParameterKey>spp_all_lon</ParameterKey>
-         <Description/>
-         <Ucd/>
-         <Units>deg</Units>
-         <UnitsConversion/>
-      </Parameter>
-      <Parameter>
-         <Name>lat iau_sun</Name>
-         <ParameterKey>spp_all_lat</ParameterKey>
-         <Description/>
-         <Ucd/>
-         <Units>deg</Units>
-         <UnitsConversion/>
-      </Parameter>
-      <Parameter>
-         <Name>xyz_hee</Name>
-         <ParameterKey>spp_all_hee</ParameterKey>
-         <Description/>
-         <Ucd/>
-         <Units>AU</Units>
-         <UnitsConversion/>
-         <Structure>
-            <Size>3</Size>
-            <Element>
-               <Name>x</Name>
-               <Index>1</Index>
-               <ParameterKey>spp_all_hee(0)</ParameterKey>
-               <ValidMin/>
-               <ValidMax/>
-               <FillValue/>
-            </Element>
-            <Element>
-               <Name>y</Name>
-               <Index>2</Index>
-               <ParameterKey>spp_all_hee(1)</ParameterKey>
-               <ValidMin/>
-               <ValidMax/>
-               <FillValue/>
-            </Element>
-            <Element>
-               <Name>z</Name>
-               <Index>3</Index>
-               <ParameterKey>spp_all_hee(2)</ParameterKey>
-               <ValidMin/>
-               <ValidMax/>
-               <FillValue/>
-            </Element>
-         </Structure>
-      </Parameter>
-      <Parameter>
-         <Name>xyz_heeq</Name>
-         <ParameterKey>spp_all_heeq</ParameterKey>
-         <Description/>
-         <Ucd/>
-         <Units>AU</Units>
-         <UnitsConversion/>
-         <Structure>
-            <Size>3</Size>
-            <Element>
-               <Name>x</Name>
-               <Index>1</Index>
-               <ParameterKey>spp_all_heeq(0)</ParameterKey>
-               <ValidMin/>
-               <ValidMax/>
-               <FillValue/>
-            </Element>
-            <Element>
-               <Name>y</Name>
-               <Index>2</Index>
-               <ParameterKey>spp_all_heeq(1)</ParameterKey>
-               <ValidMin/>
-               <ValidMax/>
-               <FillValue/>
-            </Element>
-            <Element>
-               <Name>z</Name>
-               <Index>3</Index>
-               <ParameterKey>spp_all_heeq(2)</ParameterKey>
-               <ValidMin/>
-               <ValidMax/>
-               <FillValue/>
-            </Element>
-         </Structure>
-      </Parameter>
-   </NumericalData>
-</Spase>
diff --git a/NumericalData/CDPP-AMDA/PSP/ORBIT/psp-orb.xml b/NumericalData/CDPP-AMDA/PSP/ORBIT/psp-orb.xml
new file mode 100644
index 0000000..30bff84
--- /dev/null
+++ b/NumericalData/CDPP-AMDA/PSP/ORBIT/psp-orb.xml
@@ -0,0 +1,178 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Spase xmlns="http://www.spase-group.org/data/schema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.spase-group.org/data/schema http://www.spase-group.org/data/schema/spase-2_3_1.xsd">
+   <Version>2.3.1</Version>
+   <NumericalData>
+      <ResourceID>spase://CNES/NumericalData/CDPP-AMDA/PSP/ORBIT/psp-orb</ResourceID>
+      <ResourceHeader>
+         <ResourceName>Orbit</ResourceName>
+         <AlternateName>Parker Solar Probe orbit</AlternateName>
+         <ReleaseDate>2018-10-12T10:48:29Z</ReleaseDate> 
+         <Description>Reconstructed and predicted ephemeris for Parker Solar Probe</Description>
+         <Contact>
+            <PersonID>spase://CNES/Person/NAIF</PersonID>
+            <Role>PrincipalInvestigator</Role>
+         </Contact>
+         <InformationURL>
+            <Name>Parker Solar Probe Mission Web Page, JPL</Name>
+            <URL>http://parkersolarprobe.jhuapl.edu/</URL>                        
+            <Description>Parker Solar Probe Mission Web Page, NASA Jet Propulsion Laboratory, JPL</Description>
+         </InformationURL>
+      </ResourceHeader>       
+      <AccessInformation>
+         <RepositoryID>spase://SMWG/Repository/CNES/CDPP-AMDA</RepositoryID>
+         <Availability>Online</Availability>
+         <AccessRights>Open</AccessRights>
+         <AccessURL>
+            <Name>AMDA at CDPP</Name>
+            <URL>http://amda.cdpp.eu</URL>
+         </AccessURL>
+         <Format>Text</Format>
+         <Acknowledgement>           
+         </Acknowledgement>
+      </AccessInformation>
+   <ProviderName>NASA</ProviderName>
+    <ProviderResourceName>
+       * spp_nom_20180812_20250831_v034_RO1_TCM1.bsp
+    </ProviderResourceName>
+      <InstrumentID>spase://CNES/Instrument/CDPP-AMDA/PSP/ORBIT</InstrumentID>
+      <MeasurementType>Ephemeris</MeasurementType>
+      <TemporalDescription>
+         <TimeSpan>
+             <StartDate>2018-08-13T00:00:00Z</StartDate>
+             <StopDate>2025-08-30T22:00:00Z</StopDate>
+         </TimeSpan>
+      <Cadence>PT1H</Cadence></TemporalDescription>
+      <ObservedRegion>Heliosphere</ObservedRegion>
+      <Caveats>
+      </Caveats>    
+<Parameter>
+   <Name>xyz_iau_sun</Name>
+   <ParameterKey>psp_orb_xyz</ParameterKey>
+   <Description/>
+   <Ucd/>
+   <Units>AU</Units>
+   <UnitsConversion/>
+   <Structure>
+      <Size>3</Size>
+      <Element>
+         <Name>x</Name>
+         <Index>1</Index>
+         <ParameterKey>psp_orb_xyz(0)</ParameterKey>
+         <ValidMin/>
+         <ValidMax/>
+         <FillValue/>
+      </Element>
+      <Element>
+         <Name>y</Name>
+         <Index>2</Index>
+         <ParameterKey>psp_orb_xyz(1)</ParameterKey>
+         <ValidMin/>
+         <ValidMax/>
+         <FillValue/>
+      </Element>
+      <Element>
+         <Name>z</Name>
+         <Index>3</Index>
+         <ParameterKey>psp_orb_xyz(2)</ParameterKey>
+         <ValidMin/>
+         <ValidMax/>
+         <FillValue/>
+      </Element>
+   </Structure>
+</Parameter>
+      <Parameter>
+         <Name>distance psp-sun</Name>
+         <ParameterKey>psp_orb_r</ParameterKey>
+         <Description/>
+         <Ucd/>
+         <Units>AU</Units>
+         <UnitsConversion/>
+      </Parameter>
+      <Parameter>
+         <Name>lon iau_sun</Name>
+         <ParameterKey>psp_orb_lon</ParameterKey>
+         <Description/>
+         <Ucd/>
+         <Units>deg</Units>
+         <UnitsConversion/>
+      </Parameter>
+      <Parameter>
+         <Name>lat iau_sun</Name>
+         <ParameterKey>psp_orb_lat</ParameterKey>
+         <Description/>
+         <Ucd/>
+         <Units>deg</Units>
+         <UnitsConversion/>
+      </Parameter>
+      <Parameter>
+         <Name>xyz_hee</Name>
+         <ParameterKey>psp_orb_hee</ParameterKey>
+         <Description/>
+         <Ucd/>
+         <Units>AU</Units>
+         <UnitsConversion/>
+         <Structure>
+            <Size>3</Size>
+            <Element>
+               <Name>x</Name>
+               <Index>1</Index>
+               <ParameterKey>psp_orb_hee(0)</ParameterKey>
+               <ValidMin/>
+               <ValidMax/>
+               <FillValue/>
+            </Element>
+            <Element>
+               <Name>y</Name>
+               <Index>2</Index>
+               <ParameterKey>psp_orb_hee(1)</ParameterKey>
+               <ValidMin/>
+               <ValidMax/>
+               <FillValue/>
+            </Element>
+            <Element>
+               <Name>z</Name>
+               <Index>3</Index>
+               <ParameterKey>psp_orb_hee(2)</ParameterKey>
+               <ValidMin/>
+               <ValidMax/>
+               <FillValue/>
+            </Element>
+         </Structure>
+      </Parameter>
+      <Parameter>
+         <Name>xyz_heeq</Name>
+         <ParameterKey>psp_orb_heeq</ParameterKey>
+         <Description/>
+         <Ucd/>
+         <Units>AU</Units>
+         <UnitsConversion/>
+         <Structure>
+            <Size>3</Size>
+            <Element>
+               <Name>x</Name>
+               <Index>1</Index>
+               <ParameterKey>psp_orb_heeq(0)</ParameterKey>
+               <ValidMin/>
+               <ValidMax/>
+               <FillValue/>
+            </Element>
+            <Element>
+               <Name>y</Name>
+               <Index>2</Index>
+               <ParameterKey>psp_orb_heeq(1)</ParameterKey>
+               <ValidMin/>
+               <ValidMax/>
+               <FillValue/>
+            </Element>
+            <Element>
+               <Name>z</Name>
+               <Index>3</Index>
+               <ParameterKey>psp_orb_heeq(2)</ParameterKey>
+               <ValidMin/>
+               <ValidMax/>
+               <FillValue/>
+            </Element>
+         </Structure>
+      </Parameter>
+   </NumericalData>
+</Spase>
--
libgit2 0.21.2