RO-Crate json implementation

.gitignore

@@ -363,3 +363,4 @@ tmp/
 /tests/**/py
 /tests/UI/cypress/screenshots/Tests/Dictionary.cy.js
 /tests/ISA/ISA.Tests/py
+/ro-crate-test.json

ARCtrl.sln

@@ -25,28 +25,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{6DA2330B-D40
 EndProject
 Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Build", "build\Build.fsproj", "{5EAFB0CD-1168-4FCA-AA61-E96AD6C85819}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ISA", "ISA", "{C61B3F43-2255-4585-9110-F8AB74F02654}"
-	ProjectSection(SolutionItems) = preProject
-		src\ISA\package.json = src\ISA\package.json
-		src\ISA\README.md = src\ISA\README.md
-	EndProjectSection
-EndProject
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "ARCtrl.ISA", "src\ISA\ISA\ARCtrl.ISA.fsproj", "{67CF6725-6AC0-47FB-A725-6DC2192713B5}"
-EndProject
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "ARCtrl.ISA.Json", "src\ISA\ISA.Json\ARCtrl.ISA.Json.fsproj", "{2CA397B2-0220-49A3-AD79-2F9F53633EC1}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{64B34A6E-318D-4E6E-9262-CE52C9B85A38}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ISA", "ISA", "{D1BBD7AE-35C8-498F-BABA-C93FFAE68037}"
-EndProject
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "ISA.Tests", "tests\ISA\ISA.Tests\ISA.Tests.fsproj", "{36EAC61E-4318-47AD-ABC8-87BC2A8C9908}"
-EndProject
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "ISA.Json.Tests", "tests\ISA\ISA.Json.Tests\ISA.Json.Tests.fsproj", "{04789F17-3DC2-4A09-848D-376E5D269740}"
-EndProject
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "ARCtrl.ISA.Spreadsheet", "src\ISA\ISA.Spreadsheet\ARCtrl.ISA.Spreadsheet.fsproj", "{07C7942E-FC34-4C27-82C1-6B2972654BA7}"
-EndProject
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "ISA.Spreadsheet.Tests", "tests\ISA\ISA.Spreadsheet.Tests\ISA.Spreadsheet.Tests.fsproj", "{656E8DAF-EFCF-472E-91D0-987D09B74523}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "JavaScript", "JavaScript", "{913222CA-261F-49CB-A823-CC7C335F964A}"
 	ProjectSection(SolutionItems) = preProject
 		tests\JavaScript\ARCtrl.Index.js = tests\JavaScript\ARCtrl.Index.js
@@ -63,12 +43,24 @@ Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "ARCtrl.Tests", "tests\ARCtr
 EndProject
 Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "ARCtrl.Contract", "src\Contract\ARCtrl.Contract.fsproj", "{1945EE8A-F105-43A9-91C9-8C4422B9873E}"
 EndProject
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FileSystem.Tests", "tests\FileSystem\FileSystem.Tests.fsproj", "{D9FE196B-AC21-4C3E-B9AE-DDDEC2158BC3}"
-EndProject
 Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "TestingUtils", "tests\TestingUtils\TestingUtils.fsproj", "{AA011593-6603-4E16-A7B0-0ED3862511DE}"
 EndProject
 Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Speedtest", "tests\Speedtest\Speedtest.fsproj", "{6EFC7E7D-840E-4506-ADBC-37130A21D1C0}"
 EndProject
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "ARCtrl.Json", "src\Json\ARCtrl.Json.fsproj", "{6DCF93BA-A918-42A0-BAD7-A11B72ADFFE6}"
+EndProject
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "ARCtrl.Spreadsheet", "src\Spreadsheet\ARCtrl.Spreadsheet.fsproj", "{74EF1B45-C7B7-4281-BDDB-7A653F9F935E}"
+EndProject
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "ARCtrl.Core", "src\Core\ARCtrl.Core.fsproj", "{FDA13C07-2E22-49D5-A317-7A68DC359894}"
+EndProject
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "ARCtrl.Core.Tests", "tests\Core\ARCtrl.Core.Tests.fsproj", "{EDC4FB2B-40CF-4AFD-90C7-CF88C2745789}"
+EndProject
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "ARCtrl.Json.Tests", "tests\Json\ARCtrl.Json.Tests.fsproj", "{9E1FF103-B5BD-44B6-B839-0E1FED2C49EC}"
+EndProject
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "ARCtrl.Spreadsheet.Tests", "tests\Spreadsheet\ARCtrl.Spreadsheet.Tests.fsproj", "{03F4E6D0-CFE7-44A6-994B-778B3DF6532C}"
+EndProject
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "ARCtrl.FileSystem.Tests", "tests\FileSystem\ARCtrl.FileSystem.Tests.fsproj", "{704935A5-68F2-4070-8A55-AFF8F66ACAD6}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -87,30 +79,6 @@ Global
 		{5EAFB0CD-1168-4FCA-AA61-E96AD6C85819}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{5EAFB0CD-1168-4FCA-AA61-E96AD6C85819}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5EAFB0CD-1168-4FCA-AA61-E96AD6C85819}.Release|Any CPU.Build.0 = Release|Any CPU
-		{67CF6725-6AC0-47FB-A725-6DC2192713B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{67CF6725-6AC0-47FB-A725-6DC2192713B5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{67CF6725-6AC0-47FB-A725-6DC2192713B5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{67CF6725-6AC0-47FB-A725-6DC2192713B5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2CA397B2-0220-49A3-AD79-2F9F53633EC1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2CA397B2-0220-49A3-AD79-2F9F53633EC1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2CA397B2-0220-49A3-AD79-2F9F53633EC1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2CA397B2-0220-49A3-AD79-2F9F53633EC1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{36EAC61E-4318-47AD-ABC8-87BC2A8C9908}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{36EAC61E-4318-47AD-ABC8-87BC2A8C9908}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{36EAC61E-4318-47AD-ABC8-87BC2A8C9908}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{36EAC61E-4318-47AD-ABC8-87BC2A8C9908}.Release|Any CPU.Build.0 = Release|Any CPU
-		{04789F17-3DC2-4A09-848D-376E5D269740}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{04789F17-3DC2-4A09-848D-376E5D269740}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{04789F17-3DC2-4A09-848D-376E5D269740}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{04789F17-3DC2-4A09-848D-376E5D269740}.Release|Any CPU.Build.0 = Release|Any CPU
-		{07C7942E-FC34-4C27-82C1-6B2972654BA7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{07C7942E-FC34-4C27-82C1-6B2972654BA7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{07C7942E-FC34-4C27-82C1-6B2972654BA7}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{07C7942E-FC34-4C27-82C1-6B2972654BA7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{656E8DAF-EFCF-472E-91D0-987D09B74523}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{656E8DAF-EFCF-472E-91D0-987D09B74523}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{656E8DAF-EFCF-472E-91D0-987D09B74523}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{656E8DAF-EFCF-472E-91D0-987D09B74523}.Release|Any CPU.Build.0 = Release|Any CPU
 		{9BE5D83D-EA90-4382-A132-174FD158227F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{9BE5D83D-EA90-4382-A132-174FD158227F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{9BE5D83D-EA90-4382-A132-174FD158227F}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -123,10 +91,6 @@ Global
 		{1945EE8A-F105-43A9-91C9-8C4422B9873E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1945EE8A-F105-43A9-91C9-8C4422B9873E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1945EE8A-F105-43A9-91C9-8C4422B9873E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D9FE196B-AC21-4C3E-B9AE-DDDEC2158BC3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D9FE196B-AC21-4C3E-B9AE-DDDEC2158BC3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D9FE196B-AC21-4C3E-B9AE-DDDEC2158BC3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D9FE196B-AC21-4C3E-B9AE-DDDEC2158BC3}.Release|Any CPU.Build.0 = Release|Any CPU
 		{AA011593-6603-4E16-A7B0-0ED3862511DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{AA011593-6603-4E16-A7B0-0ED3862511DE}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{AA011593-6603-4E16-A7B0-0ED3862511DE}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -135,28 +99,54 @@ Global
 		{6EFC7E7D-840E-4506-ADBC-37130A21D1C0}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{6EFC7E7D-840E-4506-ADBC-37130A21D1C0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6EFC7E7D-840E-4506-ADBC-37130A21D1C0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6DCF93BA-A918-42A0-BAD7-A11B72ADFFE6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6DCF93BA-A918-42A0-BAD7-A11B72ADFFE6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6DCF93BA-A918-42A0-BAD7-A11B72ADFFE6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6DCF93BA-A918-42A0-BAD7-A11B72ADFFE6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{74EF1B45-C7B7-4281-BDDB-7A653F9F935E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{74EF1B45-C7B7-4281-BDDB-7A653F9F935E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{74EF1B45-C7B7-4281-BDDB-7A653F9F935E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{74EF1B45-C7B7-4281-BDDB-7A653F9F935E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FDA13C07-2E22-49D5-A317-7A68DC359894}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FDA13C07-2E22-49D5-A317-7A68DC359894}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FDA13C07-2E22-49D5-A317-7A68DC359894}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FDA13C07-2E22-49D5-A317-7A68DC359894}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EDC4FB2B-40CF-4AFD-90C7-CF88C2745789}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EDC4FB2B-40CF-4AFD-90C7-CF88C2745789}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EDC4FB2B-40CF-4AFD-90C7-CF88C2745789}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EDC4FB2B-40CF-4AFD-90C7-CF88C2745789}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9E1FF103-B5BD-44B6-B839-0E1FED2C49EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9E1FF103-B5BD-44B6-B839-0E1FED2C49EC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9E1FF103-B5BD-44B6-B839-0E1FED2C49EC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9E1FF103-B5BD-44B6-B839-0E1FED2C49EC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{03F4E6D0-CFE7-44A6-994B-778B3DF6532C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{03F4E6D0-CFE7-44A6-994B-778B3DF6532C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{03F4E6D0-CFE7-44A6-994B-778B3DF6532C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{03F4E6D0-CFE7-44A6-994B-778B3DF6532C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{704935A5-68F2-4070-8A55-AFF8F66ACAD6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{704935A5-68F2-4070-8A55-AFF8F66ACAD6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{704935A5-68F2-4070-8A55-AFF8F66ACAD6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{704935A5-68F2-4070-8A55-AFF8F66ACAD6}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{1CD34A01-D19A-441F-8F3D-6EF69D9DDA8D} = {6DA2330B-D407-4FB1-AF05-B0184034EC44}
 		{F47E23C3-8415-4725-9E85-57271694DEB3} = {6DA2330B-D407-4FB1-AF05-B0184034EC44}
-		{C61B3F43-2255-4585-9110-F8AB74F02654} = {6DA2330B-D407-4FB1-AF05-B0184034EC44}
-		{67CF6725-6AC0-47FB-A725-6DC2192713B5} = {C61B3F43-2255-4585-9110-F8AB74F02654}
-		{2CA397B2-0220-49A3-AD79-2F9F53633EC1} = {C61B3F43-2255-4585-9110-F8AB74F02654}
-		{D1BBD7AE-35C8-498F-BABA-C93FFAE68037} = {64B34A6E-318D-4E6E-9262-CE52C9B85A38}
-		{36EAC61E-4318-47AD-ABC8-87BC2A8C9908} = {D1BBD7AE-35C8-498F-BABA-C93FFAE68037}
-		{04789F17-3DC2-4A09-848D-376E5D269740} = {D1BBD7AE-35C8-498F-BABA-C93FFAE68037}
-		{07C7942E-FC34-4C27-82C1-6B2972654BA7} = {C61B3F43-2255-4585-9110-F8AB74F02654}
-		{656E8DAF-EFCF-472E-91D0-987D09B74523} = {D1BBD7AE-35C8-498F-BABA-C93FFAE68037}
 		{913222CA-261F-49CB-A823-CC7C335F964A} = {64B34A6E-318D-4E6E-9262-CE52C9B85A38}
 		{9BE5D83D-EA90-4382-A132-174FD158227F} = {6DA2330B-D407-4FB1-AF05-B0184034EC44}
 		{801247D5-7EE5-49C8-AB26-F822A415BA49} = {64B34A6E-318D-4E6E-9262-CE52C9B85A38}
 		{1945EE8A-F105-43A9-91C9-8C4422B9873E} = {6DA2330B-D407-4FB1-AF05-B0184034EC44}
-		{D9FE196B-AC21-4C3E-B9AE-DDDEC2158BC3} = {64B34A6E-318D-4E6E-9262-CE52C9B85A38}
 		{AA011593-6603-4E16-A7B0-0ED3862511DE} = {64B34A6E-318D-4E6E-9262-CE52C9B85A38}
 		{6EFC7E7D-840E-4506-ADBC-37130A21D1C0} = {64B34A6E-318D-4E6E-9262-CE52C9B85A38}
+		{6DCF93BA-A918-42A0-BAD7-A11B72ADFFE6} = {6DA2330B-D407-4FB1-AF05-B0184034EC44}
+		{74EF1B45-C7B7-4281-BDDB-7A653F9F935E} = {6DA2330B-D407-4FB1-AF05-B0184034EC44}
+		{FDA13C07-2E22-49D5-A317-7A68DC359894} = {6DA2330B-D407-4FB1-AF05-B0184034EC44}
+		{EDC4FB2B-40CF-4AFD-90C7-CF88C2745789} = {64B34A6E-318D-4E6E-9262-CE52C9B85A38}
+		{9E1FF103-B5BD-44B6-B839-0E1FED2C49EC} = {64B34A6E-318D-4E6E-9262-CE52C9B85A38}
+		{03F4E6D0-CFE7-44A6-994B-778B3DF6532C} = {64B34A6E-318D-4E6E-9262-CE52C9B85A38}
+		{704935A5-68F2-4070-8A55-AFF8F66ACAD6} = {64B34A6E-318D-4E6E-9262-CE52C9B85A38}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {1E354DE6-99BA-421E-9EF8-E808B855A85F}

docs/scripts_js/Contracts.js

@@ -2,6 +2,12 @@ import {Xlsx} from "fsspreadsheet";
 import fs from "fs";
 import path from "path";
 
+export function normalizePathSeparators (str) {
+  const normalizedPath = path.normalize(str)
+  return normalizedPath.replace(/\\/g, '/');
+}
+
+
 // Write
 
 export function normalizePathSeparators (str) {

src/ARCtrl/ARC.fs

@@ -2,8 +2,9 @@
 
 open ARCtrl.FileSystem
 open ARCtrl.Contract
-open ARCtrl.ISA
-open ARCtrl.ISA.Spreadsheet
+open ARCtrl
+open ARCtrl.Helper
+open ARCtrl.Spreadsheet
 open FsSpreadsheet
 open Fable.Core
 
@@ -48,7 +49,7 @@ module ARCAux =
         fs.Union(tree)    
 
 [<AttachMembers>]
-type ARC(?isa : ISA.ArcInvestigation, ?cwl : CWL.CWL, ?fs : FileSystem.FileSystem) =
+type ARC(?isa : ArcInvestigation, ?cwl : CWL.CWL, ?fs : FileSystem.FileSystem) =
 
     let mutable _isa = isa
     let mutable _cwl = cwl
@@ -264,7 +265,7 @@ type ARC(?isa : ISA.ArcInvestigation, ?cwl : CWL.CWL, ?fs : FileSystem.FileSyste
         let workbooks = System.Collections.Generic.Dictionary<string, DTOType*FsWorkbook>()
         match this.ISA with
         | Some inv -> 
-            let investigationConverter = if isLight then ISA.Spreadsheet.ArcInvestigation.toLightFsWorkbook else ISA.Spreadsheet.ArcInvestigation.toFsWorkbook
+            let investigationConverter = if isLight then Spreadsheet.ArcInvestigation.toLightFsWorkbook else Spreadsheet.ArcInvestigation.toFsWorkbook
             workbooks.Add (Path.InvestigationFileName, (DTOType.ISA_Investigation, investigationConverter inv))
             inv.StaticHash <- inv.GetLightHashCode()
             inv.Studies
@@ -280,12 +281,12 @@ type ARC(?isa : ISA.ArcInvestigation, ?cwl : CWL.CWL, ?fs : FileSystem.FileSyste
                 a.StaticHash <- a.GetHashCode()
                 workbooks.Add (
                     Identifier.Assay.fileNameFromIdentifier a.Identifier,
-                    (DTOType.ISA_Assay, ISA.Spreadsheet.ArcAssay.toFsWorkbook a))                
+                    (DTOType.ISA_Assay, Spreadsheet.ArcAssay.toFsWorkbook a))                
             )
 
         | None -> 
             //printfn "ARC contains no ISA part."
-            workbooks.Add (Path.InvestigationFileName, (DTOType.ISA_Investigation, ISA.Spreadsheet.ArcInvestigation.toLightFsWorkbook (ArcInvestigation.create(Identifier.MISSING_IDENTIFIER))))
+            workbooks.Add (Path.InvestigationFileName, (DTOType.ISA_Investigation, Spreadsheet.ArcInvestigation.toLightFsWorkbook (ArcInvestigation.create(Identifier.MISSING_IDENTIFIER))))
 
         // Iterates over filesystem and creates a write contract for every file. If possible, include DTO.       
         _fs.Tree.ToFilePaths(true)

src/ARCtrl/ARCtrl.fsproj

@@ -18,16 +18,12 @@
     <None Include="../../build/logo.png" Pack="true" PackagePath="\" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Path.fs" />
-    <Compile Include="FileSystemTree.fs" />
-    <Compile Include="SemVer.fs" />
     <Compile Include="WebRequest\WebRequest.Node.fs" />
     <Compile Include="WebRequest\WebRequest.Py.fs" />
     <Compile Include="WebRequest\WebRequest.fs" />
     <Compile Include="Contracts\Contracts.ArcTypes.fs" />
     <Compile Include="Contracts\Contracts.Git.fs" />
     <Compile Include="Contracts\Contracts.ARCtrl.fs" />
-    <Compile Include="Templates\Template.fs" />
     <Compile Include="Templates\Templates.fs" />
     <Compile Include="Templates\Template.Json.fs" />
     <Compile Include="Templates\Template.Spreadsheet.fs" />
@@ -43,9 +39,8 @@
     <ProjectReference Include="..\Contract\ARCtrl.Contract.fsproj" />
     <ProjectReference Include="..\CWL\ARCtrl.CWL.fsproj" />
     <ProjectReference Include="..\FileSystem\ARCtrl.FileSystem.fsproj" />
-    <ProjectReference Include="..\ISA\ISA\ARCtrl.ISA.fsproj" />
-    <ProjectReference Include="..\ISA\ISA.Json\ARCtrl.ISA.Json.fsproj" />
-    <ProjectReference Include="..\ISA\ISA.Spreadsheet\ARCtrl.ISA.Spreadsheet.fsproj" />
+    <ProjectReference Include="..\Json\ARCtrl.Json.fsproj" />
+    <ProjectReference Include="..\Spreadsheet\ARCtrl.Spreadsheet.fsproj" />
   </ItemGroup>
   <PropertyGroup>
     <NpmDependencies>

src/ARCtrl/Contracts/Contracts.ArcTypes.fs

@@ -1,9 +1,10 @@
 namespace ARCtrl.Contract
 
-open ARCtrl
+open ARCtrl.FileSystem
 open ARCtrl.Path
-open ARCtrl.ISA.Spreadsheet
-open ARCtrl.ISA
+open ARCtrl.Spreadsheet
+open ARCtrl
+open ARCtrl.Helper
 open FsSpreadsheet
 
 
@@ -93,7 +94,7 @@ module ArcTypeExtensions =
             c
 
         member this.ToDeleteContract () =
-            let path = Path.getStudyFolderPath(this.Identifier)
+            let path = getStudyFolderPath(this.Identifier)
             let c = Contract.createDelete(path)
             c
 
@@ -135,7 +136,7 @@ module ArcTypeExtensions =
             c
 
         member this.ToDeleteContract () =
-            let path = Path.getAssayFolderPath(this.Identifier)
+            let path = getAssayFolderPath(this.Identifier)
             let c = Contract.createDelete(path)
             c