diff --git a/MANIFEST.in b/MANIFEST.in index 80365a7..816df07 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -3,7 +3,7 @@ include README.md include CHANGELOG.md include MATLAB_MAPPING.md -recursive-include ndi_common *.json *.txt *.tsv *.tsv.gz *.obo *.md -recursive-include ndi_common/example_binaries * -recursive-include ndi_common/example_datasets * -recursive-include ndi_common/daq_systems * +recursive-include src/ndi/ndi_common *.json *.txt *.tsv *.tsv.gz *.obo *.md +recursive-include src/ndi/ndi_common/example_binaries * +recursive-include src/ndi/ndi_common/example_datasets * +recursive-include src/ndi/ndi_common/daq_systems * diff --git a/pyproject.toml b/pyproject.toml index ef1a7d1..1108eeb 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -90,7 +90,7 @@ allow-direct-references = true packages = ["src/ndi"] [tool.hatch.build.targets.sdist] -include = ["/src", "/ndi_common", "/tests", "/examples", "LICENSE", "README.md", "CHANGELOG.md", "MATLAB_MAPPING.md"] +include = ["/src", "/tests", "/examples", "LICENSE", "README.md", "CHANGELOG.md", "MATLAB_MAPPING.md"] [tool.pytest.ini_options] testpaths = ["tests"] diff --git a/src/ndi/common/__init__.py b/src/ndi/common/__init__.py index 3625966..b5e0889 100644 --- a/src/ndi/common/__init__.py +++ b/src/ndi/common/__init__.py @@ -34,25 +34,19 @@ def _find_ndi_root(cls) -> Path: """Find the NDI root directory. Looks for environment variable NDI_ROOT, or tries to find it - relative to this package. Searches multiple possible locations. + relative to this package. The ndi_common directory lives inside + the ndi package (src/ndi/ndi_common), so the root is the ndi + package directory itself. """ if os.environ.get("NDI_ROOT"): return Path(os.environ["NDI_ROOT"]) - # Try to find it relative to this file - # src/ndi/common/__init__.py -> src/ndi/common -> src/ndi -> src -> repo_root - package_dir = Path(__file__).parent.parent.parent.parent + # ndi_common is inside the ndi package directory. + # src/ndi/common/__init__.py -> common -> ndi (package root) + package_dir = Path(__file__).parent.parent - # Check multiple possible locations for ndi_common - possible_paths = [ - package_dir / "ndi_common", # repo_root/ndi_common - package_dir / "src" / "ndi" / "ndi_common", # repo_root/src/ndi/ndi_common - ] - - for path in possible_paths: - if path.exists() and (path / "database_documents").exists(): - # Return the parent that contains ndi_common - return path.parent + if (package_dir / "ndi_common" / "database_documents").exists(): + return package_dir raise ValueError( "Cannot find NDI root directory. " diff --git a/ndi_common/config/ndi_document2table_abbreviations.json b/src/ndi/ndi_common/config/ndi_document2table_abbreviations.json similarity index 100% rename from ndi_common/config/ndi_document2table_abbreviations.json rename to src/ndi/ndi_common/config/ndi_document2table_abbreviations.json diff --git a/ndi_common/config/ndi_validate_config_schema.json b/src/ndi/ndi_common/config/ndi_validate_config_schema.json similarity index 100% rename from ndi_common/config/ndi_validate_config_schema.json rename to src/ndi/ndi_common/config/ndi_validate_config_schema.json diff --git a/ndi_common/controlled_vocabulary/GenBankControlledVocabulary-info.txt b/src/ndi/ndi_common/controlled_vocabulary/GenBankControlledVocabulary-info.txt similarity index 100% rename from ndi_common/controlled_vocabulary/GenBankControlledVocabulary-info.txt rename to src/ndi/ndi_common/controlled_vocabulary/GenBankControlledVocabulary-info.txt diff --git a/ndi_common/controlled_vocabulary/GenBankControlledVocabulary.tsv.gz b/src/ndi/ndi_common/controlled_vocabulary/GenBankControlledVocabulary.tsv.gz similarity index 100% rename from ndi_common/controlled_vocabulary/GenBankControlledVocabulary.tsv.gz rename to src/ndi/ndi_common/controlled_vocabulary/GenBankControlledVocabulary.tsv.gz diff --git a/ndi_common/controlled_vocabulary/NDIC.txt b/src/ndi/ndi_common/controlled_vocabulary/NDIC.txt similarity index 100% rename from ndi_common/controlled_vocabulary/NDIC.txt rename to src/ndi/ndi_common/controlled_vocabulary/NDIC.txt diff --git a/ndi_common/controlled_vocabulary/NIFBrainAreaControlledVocabulary-info.txt b/src/ndi/ndi_common/controlled_vocabulary/NIFBrainAreaControlledVocabulary-info.txt similarity index 100% rename from ndi_common/controlled_vocabulary/NIFBrainAreaControlledVocabulary-info.txt rename to src/ndi/ndi_common/controlled_vocabulary/NIFBrainAreaControlledVocabulary-info.txt diff --git a/ndi_common/controlled_vocabulary/NIFBrainAreaControlledVocabulary.tsv.gz b/src/ndi/ndi_common/controlled_vocabulary/NIFBrainAreaControlledVocabulary.tsv.gz similarity index 100% rename from ndi_common/controlled_vocabulary/NIFBrainAreaControlledVocabulary.tsv.gz rename to src/ndi/ndi_common/controlled_vocabulary/NIFBrainAreaControlledVocabulary.tsv.gz diff --git a/ndi_common/controlled_vocabulary/empty.obo b/src/ndi/ndi_common/controlled_vocabulary/empty.obo similarity index 100% rename from ndi_common/controlled_vocabulary/empty.obo rename to src/ndi/ndi_common/controlled_vocabulary/empty.obo diff --git a/ndi_common/controlled_vocabulary/uberon_temp.txt b/src/ndi/ndi_common/controlled_vocabulary/uberon_temp.txt similarity index 100% rename from ndi_common/controlled_vocabulary/uberon_temp.txt rename to src/ndi/ndi_common/controlled_vocabulary/uberon_temp.txt diff --git a/ndi_common/controlled_vocabulary/working/EMPTY.json b/src/ndi/ndi_common/controlled_vocabulary/working/EMPTY.json similarity index 100% rename from ndi_common/controlled_vocabulary/working/EMPTY.json rename to src/ndi/ndi_common/controlled_vocabulary/working/EMPTY.json diff --git a/ndi_common/controlled_vocabulary/working/empty_ontology_v0.1.0.obo b/src/ndi/ndi_common/controlled_vocabulary/working/empty_ontology_v0.1.0.obo similarity index 100% rename from ndi_common/controlled_vocabulary/working/empty_ontology_v0.1.0.obo rename to src/ndi/ndi_common/controlled_vocabulary/working/empty_ontology_v0.1.0.obo diff --git a/ndi_common/controlled_vocabulary/working/empty_ontology_v0.1.0.ttl b/src/ndi/ndi_common/controlled_vocabulary/working/empty_ontology_v0.1.0.ttl similarity index 100% rename from ndi_common/controlled_vocabulary/working/empty_ontology_v0.1.0.ttl rename to src/ndi/ndi_common/controlled_vocabulary/working/empty_ontology_v0.1.0.ttl diff --git a/ndi_common/daq_systems/angeluccilab/angelucci_blackrock5.json b/src/ndi/ndi_common/daq_systems/angeluccilab/angelucci_blackrock5.json similarity index 100% rename from ndi_common/daq_systems/angeluccilab/angelucci_blackrock5.json rename to src/ndi/ndi_common/daq_systems/angeluccilab/angelucci_blackrock5.json diff --git a/ndi_common/daq_systems/angeluccilab/angelucci_visstim.json b/src/ndi/ndi_common/daq_systems/angeluccilab/angelucci_visstim.json similarity index 100% rename from ndi_common/daq_systems/angeluccilab/angelucci_visstim.json rename to src/ndi/ndi_common/daq_systems/angeluccilab/angelucci_visstim.json diff --git a/ndi_common/daq_systems/dabrowskalab/dabrowska_mat.json b/src/ndi/ndi_common/daq_systems/dabrowskalab/dabrowska_mat.json similarity index 100% rename from ndi_common/daq_systems/dabrowskalab/dabrowska_mat.json rename to src/ndi/ndi_common/daq_systems/dabrowskalab/dabrowska_mat.json diff --git a/ndi_common/daq_systems/dbkatzlab/narendra_intan.json b/src/ndi/ndi_common/daq_systems/dbkatzlab/narendra_intan.json similarity index 100% rename from ndi_common/daq_systems/dbkatzlab/narendra_intan.json rename to src/ndi/ndi_common/daq_systems/dbkatzlab/narendra_intan.json diff --git a/ndi_common/daq_systems/gluckmanlab/gluckman_bjgbin.json b/src/ndi/ndi_common/daq_systems/gluckmanlab/gluckman_bjgbin.json similarity index 100% rename from ndi_common/daq_systems/gluckmanlab/gluckman_bjgbin.json rename to src/ndi/ndi_common/daq_systems/gluckmanlab/gluckman_bjgbin.json diff --git a/ndi_common/daq_systems/kjnielsenlab/nielsen_intan.json b/src/ndi/ndi_common/daq_systems/kjnielsenlab/nielsen_intan.json similarity index 100% rename from ndi_common/daq_systems/kjnielsenlab/nielsen_intan.json rename to src/ndi/ndi_common/daq_systems/kjnielsenlab/nielsen_intan.json diff --git a/ndi_common/daq_systems/kjnielsenlab/nielsen_vis.json b/src/ndi/ndi_common/daq_systems/kjnielsenlab/nielsen_vis.json similarity index 100% rename from ndi_common/daq_systems/kjnielsenlab/nielsen_vis.json rename to src/ndi/ndi_common/daq_systems/kjnielsenlab/nielsen_vis.json diff --git a/ndi_common/daq_systems/marderlab/marder_abf.json b/src/ndi/ndi_common/daq_systems/marderlab/marder_abf.json similarity index 100% rename from ndi_common/daq_systems/marderlab/marder_abf.json rename to src/ndi/ndi_common/daq_systems/marderlab/marder_abf.json diff --git a/ndi_common/daq_systems/marderlab/marder_ced.json b/src/ndi/ndi_common/daq_systems/marderlab/marder_ced.json similarity index 100% rename from ndi_common/daq_systems/marderlab/marder_ced.json rename to src/ndi/ndi_common/daq_systems/marderlab/marder_ced.json diff --git a/ndi_common/daq_systems/sjbirrenlab/sjbirren_abf.json b/src/ndi/ndi_common/daq_systems/sjbirrenlab/sjbirren_abf.json similarity index 100% rename from ndi_common/daq_systems/sjbirrenlab/sjbirren_abf.json rename to src/ndi/ndi_common/daq_systems/sjbirrenlab/sjbirren_abf.json diff --git a/ndi_common/daq_systems/vhlab/vhintan.json b/src/ndi/ndi_common/daq_systems/vhlab/vhintan.json similarity index 100% rename from ndi_common/daq_systems/vhlab/vhintan.json rename to src/ndi/ndi_common/daq_systems/vhlab/vhintan.json diff --git a/ndi_common/daq_systems/vhlab/vhspike2.json b/src/ndi/ndi_common/daq_systems/vhlab/vhspike2.json similarity index 100% rename from ndi_common/daq_systems/vhlab/vhspike2.json rename to src/ndi/ndi_common/daq_systems/vhlab/vhspike2.json diff --git a/ndi_common/daq_systems/vhlab/vhvis_spike2.json b/src/ndi/ndi_common/daq_systems/vhlab/vhvis_spike2.json similarity index 100% rename from ndi_common/daq_systems/vhlab/vhvis_spike2.json rename to src/ndi/ndi_common/daq_systems/vhlab/vhvis_spike2.json diff --git a/ndi_common/daq_systems/yangyangwang/yangyang_tdt_sev.json b/src/ndi/ndi_common/daq_systems/yangyangwang/yangyang_tdt_sev.json similarity index 100% rename from ndi_common/daq_systems/yangyangwang/yangyang_tdt_sev.json rename to src/ndi/ndi_common/daq_systems/yangyangwang/yangyang_tdt_sev.json diff --git a/ndi_common/database_documents/animalsubject.json b/src/ndi/ndi_common/database_documents/animalsubject.json similarity index 100% rename from ndi_common/database_documents/animalsubject.json rename to src/ndi/ndi_common/database_documents/animalsubject.json diff --git a/ndi_common/database_documents/app.json b/src/ndi/ndi_common/database_documents/app.json similarity index 100% rename from ndi_common/database_documents/app.json rename to src/ndi/ndi_common/database_documents/app.json diff --git a/ndi_common/database_documents/apps/calculators/simple_calc.json b/src/ndi/ndi_common/database_documents/apps/calculators/simple_calc.json similarity index 100% rename from ndi_common/database_documents/apps/calculators/simple_calc.json rename to src/ndi/ndi_common/database_documents/apps/calculators/simple_calc.json diff --git a/ndi_common/database_documents/apps/calculators/tuningcurve_calc.json b/src/ndi/ndi_common/database_documents/apps/calculators/tuningcurve_calc.json similarity index 100% rename from ndi_common/database_documents/apps/calculators/tuningcurve_calc.json rename to src/ndi/ndi_common/database_documents/apps/calculators/tuningcurve_calc.json diff --git a/ndi_common/database_documents/apps/jrclust/jrclust_clusters.json b/src/ndi/ndi_common/database_documents/apps/jrclust/jrclust_clusters.json similarity index 100% rename from ndi_common/database_documents/apps/jrclust/jrclust_clusters.json rename to src/ndi/ndi_common/database_documents/apps/jrclust/jrclust_clusters.json diff --git a/ndi_common/database_documents/apps/jrclust/jrclust_clusters.md b/src/ndi/ndi_common/database_documents/apps/jrclust/jrclust_clusters.md similarity index 100% rename from ndi_common/database_documents/apps/jrclust/jrclust_clusters.md rename to src/ndi/ndi_common/database_documents/apps/jrclust/jrclust_clusters.md diff --git a/ndi_common/database_documents/apps/markgarbage/valid_interval.json b/src/ndi/ndi_common/database_documents/apps/markgarbage/valid_interval.json similarity index 100% rename from ndi_common/database_documents/apps/markgarbage/valid_interval.json rename to src/ndi/ndi_common/database_documents/apps/markgarbage/valid_interval.json diff --git a/ndi_common/database_documents/apps/spikeextractor/spike_extraction_parameters.json b/src/ndi/ndi_common/database_documents/apps/spikeextractor/spike_extraction_parameters.json similarity index 100% rename from ndi_common/database_documents/apps/spikeextractor/spike_extraction_parameters.json rename to src/ndi/ndi_common/database_documents/apps/spikeextractor/spike_extraction_parameters.json diff --git a/ndi_common/database_documents/apps/spikeextractor/spike_extraction_parameters_modification.json b/src/ndi/ndi_common/database_documents/apps/spikeextractor/spike_extraction_parameters_modification.json similarity index 100% rename from ndi_common/database_documents/apps/spikeextractor/spike_extraction_parameters_modification.json rename to src/ndi/ndi_common/database_documents/apps/spikeextractor/spike_extraction_parameters_modification.json diff --git a/ndi_common/database_documents/apps/spikeextractor/spikewaves.json b/src/ndi/ndi_common/database_documents/apps/spikeextractor/spikewaves.json similarity index 100% rename from ndi_common/database_documents/apps/spikeextractor/spikewaves.json rename to src/ndi/ndi_common/database_documents/apps/spikeextractor/spikewaves.json diff --git a/ndi_common/database_documents/apps/spikesorter/sorting_parameters.json b/src/ndi/ndi_common/database_documents/apps/spikesorter/sorting_parameters.json similarity index 100% rename from ndi_common/database_documents/apps/spikesorter/sorting_parameters.json rename to src/ndi/ndi_common/database_documents/apps/spikesorter/sorting_parameters.json diff --git a/ndi_common/database_documents/apps/spikesorter/spike_clusters.json b/src/ndi/ndi_common/database_documents/apps/spikesorter/spike_clusters.json similarity index 100% rename from ndi_common/database_documents/apps/spikesorter/spike_clusters.json rename to src/ndi/ndi_common/database_documents/apps/spikesorter/spike_clusters.json diff --git a/ndi_common/database_documents/apps/vhlab_voltage2firingrate/binnedspikeratevm.json b/src/ndi/ndi_common/database_documents/apps/vhlab_voltage2firingrate/binnedspikeratevm.json similarity index 100% rename from ndi_common/database_documents/apps/vhlab_voltage2firingrate/binnedspikeratevm.json rename to src/ndi/ndi_common/database_documents/apps/vhlab_voltage2firingrate/binnedspikeratevm.json diff --git a/ndi_common/database_documents/apps/vhlab_voltage2firingrate/vmneuralresponseresiduals.json b/src/ndi/ndi_common/database_documents/apps/vhlab_voltage2firingrate/vmneuralresponseresiduals.json similarity index 100% rename from ndi_common/database_documents/apps/vhlab_voltage2firingrate/vmneuralresponseresiduals.json rename to src/ndi/ndi_common/database_documents/apps/vhlab_voltage2firingrate/vmneuralresponseresiduals.json diff --git a/ndi_common/database_documents/apps/vhlab_voltage2firingrate/vmspikefilteringparameters.json b/src/ndi/ndi_common/database_documents/apps/vhlab_voltage2firingrate/vmspikefilteringparameters.json similarity index 100% rename from ndi_common/database_documents/apps/vhlab_voltage2firingrate/vmspikefilteringparameters.json rename to src/ndi/ndi_common/database_documents/apps/vhlab_voltage2firingrate/vmspikefilteringparameters.json diff --git a/ndi_common/database_documents/apps/vhlab_voltage2firingrate/vmspikefit.json b/src/ndi/ndi_common/database_documents/apps/vhlab_voltage2firingrate/vmspikefit.json similarity index 100% rename from ndi_common/database_documents/apps/vhlab_voltage2firingrate/vmspikefit.json rename to src/ndi/ndi_common/database_documents/apps/vhlab_voltage2firingrate/vmspikefit.json diff --git a/ndi_common/database_documents/apps/vhlab_voltage2firingrate/vmspikesummary.json b/src/ndi/ndi_common/database_documents/apps/vhlab_voltage2firingrate/vmspikesummary.json similarity index 100% rename from ndi_common/database_documents/apps/vhlab_voltage2firingrate/vmspikesummary.json rename to src/ndi/ndi_common/database_documents/apps/vhlab_voltage2firingrate/vmspikesummary.json diff --git a/ndi_common/database_documents/base.json b/src/ndi/ndi_common/database_documents/base.json similarity index 100% rename from ndi_common/database_documents/base.json rename to src/ndi/ndi_common/database_documents/base.json diff --git a/ndi_common/database_documents/daq/daqmetadatareader.json b/src/ndi/ndi_common/database_documents/daq/daqmetadatareader.json similarity index 100% rename from ndi_common/database_documents/daq/daqmetadatareader.json rename to src/ndi/ndi_common/database_documents/daq/daqmetadatareader.json diff --git a/ndi_common/database_documents/daq/daqreader.json b/src/ndi/ndi_common/database_documents/daq/daqreader.json similarity index 100% rename from ndi_common/database_documents/daq/daqreader.json rename to src/ndi/ndi_common/database_documents/daq/daqreader.json diff --git a/ndi_common/database_documents/daq/daqreader_ndr.json b/src/ndi/ndi_common/database_documents/daq/daqreader_ndr.json similarity index 100% rename from ndi_common/database_documents/daq/daqreader_ndr.json rename to src/ndi/ndi_common/database_documents/daq/daqreader_ndr.json diff --git a/ndi_common/database_documents/daq/daqsystem.json b/src/ndi/ndi_common/database_documents/daq/daqsystem.json similarity index 100% rename from ndi_common/database_documents/daq/daqsystem.json rename to src/ndi/ndi_common/database_documents/daq/daqsystem.json diff --git a/ndi_common/database_documents/daq/filenavigator.json b/src/ndi/ndi_common/database_documents/daq/filenavigator.json similarity index 100% rename from ndi_common/database_documents/daq/filenavigator.json rename to src/ndi/ndi_common/database_documents/daq/filenavigator.json diff --git a/ndi_common/database_documents/daq/syncgraph.json b/src/ndi/ndi_common/database_documents/daq/syncgraph.json similarity index 100% rename from ndi_common/database_documents/daq/syncgraph.json rename to src/ndi/ndi_common/database_documents/daq/syncgraph.json diff --git a/ndi_common/database_documents/daq/syncrule.json b/src/ndi/ndi_common/database_documents/daq/syncrule.json similarity index 100% rename from ndi_common/database_documents/daq/syncrule.json rename to src/ndi/ndi_common/database_documents/daq/syncrule.json diff --git a/ndi_common/database_documents/data/binaryseries_parameters.json b/src/ndi/ndi_common/database_documents/data/binaryseries_parameters.json similarity index 100% rename from ndi_common/database_documents/data/binaryseries_parameters.json rename to src/ndi/ndi_common/database_documents/data/binaryseries_parameters.json diff --git a/ndi_common/database_documents/data/fitcurve.json b/src/ndi/ndi_common/database_documents/data/fitcurve.json similarity index 100% rename from ndi_common/database_documents/data/fitcurve.json rename to src/ndi/ndi_common/database_documents/data/fitcurve.json diff --git a/ndi_common/database_documents/data/generic_file.json b/src/ndi/ndi_common/database_documents/data/generic_file.json similarity index 100% rename from ndi_common/database_documents/data/generic_file.json rename to src/ndi/ndi_common/database_documents/data/generic_file.json diff --git a/ndi_common/database_documents/data/image.json b/src/ndi/ndi_common/database_documents/data/image.json similarity index 100% rename from ndi_common/database_documents/data/image.json rename to src/ndi/ndi_common/database_documents/data/image.json diff --git a/ndi_common/database_documents/data/imageCollection.json b/src/ndi/ndi_common/database_documents/data/imageCollection.json similarity index 100% rename from ndi_common/database_documents/data/imageCollection.json rename to src/ndi/ndi_common/database_documents/data/imageCollection.json diff --git a/ndi_common/database_documents/data/imageStack.json b/src/ndi/ndi_common/database_documents/data/imageStack.json similarity index 100% rename from ndi_common/database_documents/data/imageStack.json rename to src/ndi/ndi_common/database_documents/data/imageStack.json diff --git a/ndi_common/database_documents/data/imageStack_parameters.json b/src/ndi/ndi_common/database_documents/data/imageStack_parameters.json similarity index 100% rename from ndi_common/database_documents/data/imageStack_parameters.json rename to src/ndi/ndi_common/database_documents/data/imageStack_parameters.json diff --git a/ndi_common/database_documents/data/ngrid.json b/src/ndi/ndi_common/database_documents/data/ngrid.json similarity index 100% rename from ndi_common/database_documents/data/ngrid.json rename to src/ndi/ndi_common/database_documents/data/ngrid.json diff --git a/ndi_common/database_documents/data/ontologyImage.json b/src/ndi/ndi_common/database_documents/data/ontologyImage.json similarity index 100% rename from ndi_common/database_documents/data/ontologyImage.json rename to src/ndi/ndi_common/database_documents/data/ontologyImage.json diff --git a/ndi_common/database_documents/data/ontologyLabel.json b/src/ndi/ndi_common/database_documents/data/ontologyLabel.json similarity index 100% rename from ndi_common/database_documents/data/ontologyLabel.json rename to src/ndi/ndi_common/database_documents/data/ontologyLabel.json diff --git a/ndi_common/database_documents/data/ontologyTableRow.json b/src/ndi/ndi_common/database_documents/data/ontologyTableRow.json similarity index 100% rename from ndi_common/database_documents/data/ontologyTableRow.json rename to src/ndi/ndi_common/database_documents/data/ontologyTableRow.json diff --git a/ndi_common/database_documents/dataset_remote.json b/src/ndi/ndi_common/database_documents/dataset_remote.json similarity index 100% rename from ndi_common/database_documents/dataset_remote.json rename to src/ndi/ndi_common/database_documents/dataset_remote.json diff --git a/ndi_common/database_documents/dataset_session_info.json b/src/ndi/ndi_common/database_documents/dataset_session_info.json similarity index 100% rename from ndi_common/database_documents/dataset_session_info.json rename to src/ndi/ndi_common/database_documents/dataset_session_info.json diff --git a/ndi_common/database_documents/demoNDI.json b/src/ndi/ndi_common/database_documents/demoNDI.json similarity index 100% rename from ndi_common/database_documents/demoNDI.json rename to src/ndi/ndi_common/database_documents/demoNDI.json diff --git a/ndi_common/database_documents/element.json b/src/ndi/ndi_common/database_documents/element.json similarity index 100% rename from ndi_common/database_documents/element.json rename to src/ndi/ndi_common/database_documents/element.json diff --git a/ndi_common/database_documents/element/distance_metadata.json b/src/ndi/ndi_common/database_documents/element/distance_metadata.json similarity index 100% rename from ndi_common/database_documents/element/distance_metadata.json rename to src/ndi/ndi_common/database_documents/element/distance_metadata.json diff --git a/ndi_common/database_documents/element/position_metadata.json b/src/ndi/ndi_common/database_documents/element/position_metadata.json similarity index 100% rename from ndi_common/database_documents/element/position_metadata.json rename to src/ndi/ndi_common/database_documents/element/position_metadata.json diff --git a/ndi_common/database_documents/element_epoch.json b/src/ndi/ndi_common/database_documents/element_epoch.json similarity index 100% rename from ndi_common/database_documents/element_epoch.json rename to src/ndi/ndi_common/database_documents/element_epoch.json diff --git a/ndi_common/database_documents/epochclocktimes.json b/src/ndi/ndi_common/database_documents/epochclocktimes.json similarity index 100% rename from ndi_common/database_documents/epochclocktimes.json rename to src/ndi/ndi_common/database_documents/epochclocktimes.json diff --git a/ndi_common/database_documents/epochid.json b/src/ndi/ndi_common/database_documents/epochid.json similarity index 100% rename from ndi_common/database_documents/epochid.json rename to src/ndi/ndi_common/database_documents/epochid.json diff --git a/ndi_common/database_documents/ingestion/daqmetadatareader_epochdata_ingested.json b/src/ndi/ndi_common/database_documents/ingestion/daqmetadatareader_epochdata_ingested.json similarity index 100% rename from ndi_common/database_documents/ingestion/daqmetadatareader_epochdata_ingested.json rename to src/ndi/ndi_common/database_documents/ingestion/daqmetadatareader_epochdata_ingested.json diff --git a/ndi_common/database_documents/ingestion/daqreader_epochdata_ingested.json b/src/ndi/ndi_common/database_documents/ingestion/daqreader_epochdata_ingested.json similarity index 100% rename from ndi_common/database_documents/ingestion/daqreader_epochdata_ingested.json rename to src/ndi/ndi_common/database_documents/ingestion/daqreader_epochdata_ingested.json diff --git a/ndi_common/database_documents/ingestion/daqreader_mfdaq_epochdata_ingested.json b/src/ndi/ndi_common/database_documents/ingestion/daqreader_mfdaq_epochdata_ingested.json similarity index 100% rename from ndi_common/database_documents/ingestion/daqreader_mfdaq_epochdata_ingested.json rename to src/ndi/ndi_common/database_documents/ingestion/daqreader_mfdaq_epochdata_ingested.json diff --git a/ndi_common/database_documents/ingestion/epochfiles_ingested.json b/src/ndi/ndi_common/database_documents/ingestion/epochfiles_ingested.json similarity index 100% rename from ndi_common/database_documents/ingestion/epochfiles_ingested.json rename to src/ndi/ndi_common/database_documents/ingestion/epochfiles_ingested.json diff --git a/ndi_common/database_documents/ingestion/metadata_editor.json b/src/ndi/ndi_common/database_documents/ingestion/metadata_editor.json similarity index 100% rename from ndi_common/database_documents/ingestion/metadata_editor.json rename to src/ndi/ndi_common/database_documents/ingestion/metadata_editor.json diff --git a/ndi_common/database_documents/ingestion/syncrule_mapping.json b/src/ndi/ndi_common/database_documents/ingestion/syncrule_mapping.json similarity index 100% rename from ndi_common/database_documents/ingestion/syncrule_mapping.json rename to src/ndi/ndi_common/database_documents/ingestion/syncrule_mapping.json diff --git a/ndi_common/database_documents/measurement.json b/src/ndi/ndi_common/database_documents/measurement.json similarity index 100% rename from ndi_common/database_documents/measurement.json rename to src/ndi/ndi_common/database_documents/measurement.json diff --git a/ndi_common/database_documents/metadata/openminds.json b/src/ndi/ndi_common/database_documents/metadata/openminds.json similarity index 100% rename from ndi_common/database_documents/metadata/openminds.json rename to src/ndi/ndi_common/database_documents/metadata/openminds.json diff --git a/ndi_common/database_documents/metadata/openminds_element.json b/src/ndi/ndi_common/database_documents/metadata/openminds_element.json similarity index 100% rename from ndi_common/database_documents/metadata/openminds_element.json rename to src/ndi/ndi_common/database_documents/metadata/openminds_element.json diff --git a/ndi_common/database_documents/metadata/openminds_stimulus.json b/src/ndi/ndi_common/database_documents/metadata/openminds_stimulus.json similarity index 100% rename from ndi_common/database_documents/metadata/openminds_stimulus.json rename to src/ndi/ndi_common/database_documents/metadata/openminds_stimulus.json diff --git a/ndi_common/database_documents/metadata/openminds_subject.json b/src/ndi/ndi_common/database_documents/metadata/openminds_subject.json similarity index 100% rename from ndi_common/database_documents/metadata/openminds_subject.json rename to src/ndi/ndi_common/database_documents/metadata/openminds_subject.json diff --git a/ndi_common/database_documents/mock.json b/src/ndi/ndi_common/database_documents/mock.json similarity index 100% rename from ndi_common/database_documents/mock.json rename to src/ndi/ndi_common/database_documents/mock.json diff --git a/ndi_common/database_documents/mock/demoNDIMock.json b/src/ndi/ndi_common/database_documents/mock/demoNDIMock.json similarity index 100% rename from ndi_common/database_documents/mock/demoNDIMock.json rename to src/ndi/ndi_common/database_documents/mock/demoNDIMock.json diff --git a/ndi_common/database_documents/neuron/neuron_extracellular.json b/src/ndi/ndi_common/database_documents/neuron/neuron_extracellular.json similarity index 100% rename from ndi_common/database_documents/neuron/neuron_extracellular.json rename to src/ndi/ndi_common/database_documents/neuron/neuron_extracellular.json diff --git a/ndi_common/database_documents/oneepoch.json b/src/ndi/ndi_common/database_documents/oneepoch.json similarity index 100% rename from ndi_common/database_documents/oneepoch.json rename to src/ndi/ndi_common/database_documents/oneepoch.json diff --git a/ndi_common/database_documents/probe/electrode_offset_voltage.json b/src/ndi/ndi_common/database_documents/probe/electrode_offset_voltage.json similarity index 100% rename from ndi_common/database_documents/probe/electrode_offset_voltage.json rename to src/ndi/ndi_common/database_documents/probe/electrode_offset_voltage.json diff --git a/ndi_common/database_documents/probe/probe_geometry.json b/src/ndi/ndi_common/database_documents/probe/probe_geometry.json similarity index 100% rename from ndi_common/database_documents/probe/probe_geometry.json rename to src/ndi/ndi_common/database_documents/probe/probe_geometry.json diff --git a/ndi_common/database_documents/probe/probe_location.json b/src/ndi/ndi_common/database_documents/probe/probe_location.json similarity index 100% rename from ndi_common/database_documents/probe/probe_location.json rename to src/ndi/ndi_common/database_documents/probe/probe_location.json diff --git a/ndi_common/database_documents/probe/site2channelmap.json b/src/ndi/ndi_common/database_documents/probe/site2channelmap.json similarity index 100% rename from ndi_common/database_documents/probe/site2channelmap.json rename to src/ndi/ndi_common/database_documents/probe/site2channelmap.json diff --git a/ndi_common/database_documents/projectvar.json b/src/ndi/ndi_common/database_documents/projectvar.json similarity index 100% rename from ndi_common/database_documents/projectvar.json rename to src/ndi/ndi_common/database_documents/projectvar.json diff --git a/ndi_common/database_documents/session.json b/src/ndi/ndi_common/database_documents/session.json similarity index 100% rename from ndi_common/database_documents/session.json rename to src/ndi/ndi_common/database_documents/session.json diff --git a/ndi_common/database_documents/session_in_a_dataset.json b/src/ndi/ndi_common/database_documents/session_in_a_dataset.json similarity index 100% rename from ndi_common/database_documents/session_in_a_dataset.json rename to src/ndi/ndi_common/database_documents/session_in_a_dataset.json diff --git a/ndi_common/database_documents/sorting/SpikeInterfaceSortingOutputs.json b/src/ndi/ndi_common/database_documents/sorting/SpikeInterfaceSortingOutputs.json similarity index 100% rename from ndi_common/database_documents/sorting/SpikeInterfaceSortingOutputs.json rename to src/ndi/ndi_common/database_documents/sorting/SpikeInterfaceSortingOutputs.json diff --git a/ndi_common/database_documents/stimulus/control_stimulus_ids.json b/src/ndi/ndi_common/database_documents/stimulus/control_stimulus_ids.json similarity index 100% rename from ndi_common/database_documents/stimulus/control_stimulus_ids.json rename to src/ndi/ndi_common/database_documents/stimulus/control_stimulus_ids.json diff --git a/ndi_common/database_documents/stimulus/stimulus_bath.json b/src/ndi/ndi_common/database_documents/stimulus/stimulus_bath.json similarity index 100% rename from ndi_common/database_documents/stimulus/stimulus_bath.json rename to src/ndi/ndi_common/database_documents/stimulus/stimulus_bath.json diff --git a/ndi_common/database_documents/stimulus/stimulus_parameter.json b/src/ndi/ndi_common/database_documents/stimulus/stimulus_parameter.json similarity index 100% rename from ndi_common/database_documents/stimulus/stimulus_parameter.json rename to src/ndi/ndi_common/database_documents/stimulus/stimulus_parameter.json diff --git a/ndi_common/database_documents/stimulus/stimulus_parameter_table.json b/src/ndi/ndi_common/database_documents/stimulus/stimulus_parameter_table.json similarity index 100% rename from ndi_common/database_documents/stimulus/stimulus_parameter_table.json rename to src/ndi/ndi_common/database_documents/stimulus/stimulus_parameter_table.json diff --git a/ndi_common/database_documents/stimulus/stimulus_presentation.json b/src/ndi/ndi_common/database_documents/stimulus/stimulus_presentation.json similarity index 100% rename from ndi_common/database_documents/stimulus/stimulus_presentation.json rename to src/ndi/ndi_common/database_documents/stimulus/stimulus_presentation.json diff --git a/ndi_common/database_documents/stimulus/stimulus_response.json b/src/ndi/ndi_common/database_documents/stimulus/stimulus_response.json similarity index 100% rename from ndi_common/database_documents/stimulus/stimulus_response.json rename to src/ndi/ndi_common/database_documents/stimulus/stimulus_response.json diff --git a/ndi_common/database_documents/stimulus/stimulus_response_scalar.json b/src/ndi/ndi_common/database_documents/stimulus/stimulus_response_scalar.json similarity index 100% rename from ndi_common/database_documents/stimulus/stimulus_response_scalar.json rename to src/ndi/ndi_common/database_documents/stimulus/stimulus_response_scalar.json diff --git a/ndi_common/database_documents/stimulus/stimulus_response_scalar_parameters.json b/src/ndi/ndi_common/database_documents/stimulus/stimulus_response_scalar_parameters.json similarity index 100% rename from ndi_common/database_documents/stimulus/stimulus_response_scalar_parameters.json rename to src/ndi/ndi_common/database_documents/stimulus/stimulus_response_scalar_parameters.json diff --git a/ndi_common/database_documents/stimulus/stimulus_response_scalar_parameters_basic.json b/src/ndi/ndi_common/database_documents/stimulus/stimulus_response_scalar_parameters_basic.json similarity index 100% rename from ndi_common/database_documents/stimulus/stimulus_response_scalar_parameters_basic.json rename to src/ndi/ndi_common/database_documents/stimulus/stimulus_response_scalar_parameters_basic.json diff --git a/ndi_common/database_documents/stimulus/stimulus_tuningcurve.json b/src/ndi/ndi_common/database_documents/stimulus/stimulus_tuningcurve.json similarity index 100% rename from ndi_common/database_documents/stimulus/stimulus_tuningcurve.json rename to src/ndi/ndi_common/database_documents/stimulus/stimulus_tuningcurve.json diff --git a/ndi_common/database_documents/stimulus/vision/oridir/orientation_direction_tuning.json b/src/ndi/ndi_common/database_documents/stimulus/vision/oridir/orientation_direction_tuning.json similarity index 100% rename from ndi_common/database_documents/stimulus/vision/oridir/orientation_direction_tuning.json rename to src/ndi/ndi_common/database_documents/stimulus/vision/oridir/orientation_direction_tuning.json diff --git a/ndi_common/database_documents/subject.json b/src/ndi/ndi_common/database_documents/subject.json similarity index 100% rename from ndi_common/database_documents/subject.json rename to src/ndi/ndi_common/database_documents/subject.json diff --git a/ndi_common/database_documents/subject_group.json b/src/ndi/ndi_common/database_documents/subject_group.json similarity index 100% rename from ndi_common/database_documents/subject_group.json rename to src/ndi/ndi_common/database_documents/subject_group.json diff --git a/ndi_common/database_documents/subjectmeasurement.json b/src/ndi/ndi_common/database_documents/subjectmeasurement.json similarity index 100% rename from ndi_common/database_documents/subjectmeasurement.json rename to src/ndi/ndi_common/database_documents/subjectmeasurement.json diff --git a/ndi_common/database_documents/treatment.json b/src/ndi/ndi_common/database_documents/treatment.json similarity index 100% rename from ndi_common/database_documents/treatment.json rename to src/ndi/ndi_common/database_documents/treatment.json diff --git a/ndi_common/database_documents/treatment/treatment_drug.json b/src/ndi/ndi_common/database_documents/treatment/treatment_drug.json similarity index 100% rename from ndi_common/database_documents/treatment/treatment_drug.json rename to src/ndi/ndi_common/database_documents/treatment/treatment_drug.json diff --git a/ndi_common/database_documents/treatment/virus_injection.json b/src/ndi/ndi_common/database_documents/treatment/virus_injection.json similarity index 100% rename from ndi_common/database_documents/treatment/virus_injection.json rename to src/ndi/ndi_common/database_documents/treatment/virus_injection.json diff --git a/ndi_common/example_binaries/4126945b0315ec90_c0d16626cae2dacf b/src/ndi/ndi_common/example_binaries/4126945b0315ec90_c0d16626cae2dacf similarity index 100% rename from ndi_common/example_binaries/4126945b0315ec90_c0d16626cae2dacf rename to src/ndi/ndi_common/example_binaries/4126945b0315ec90_c0d16626cae2dacf diff --git a/ndi_common/example_datasets/NDIDatasetUpload/metadata.mat b/src/ndi/ndi_common/example_datasets/NDIDatasetUpload/metadata.mat similarity index 100% rename from ndi_common/example_datasets/NDIDatasetUpload/metadata.mat rename to src/ndi/ndi_common/example_datasets/NDIDatasetUpload/metadata.mat diff --git a/ndi_common/example_datasets/NDIDatasetUpload/strain.mat b/src/ndi/ndi_common/example_datasets/NDIDatasetUpload/strain.mat similarity index 100% rename from ndi_common/example_datasets/NDIDatasetUpload/strain.mat rename to src/ndi/ndi_common/example_datasets/NDIDatasetUpload/strain.mat diff --git a/ndi_common/example_datasets/sample_test.mat b/src/ndi/ndi_common/example_datasets/sample_test.mat similarity index 100% rename from ndi_common/example_datasets/sample_test.mat rename to src/ndi/ndi_common/example_datasets/sample_test.mat diff --git a/ndi_common/ndi_common.md b/src/ndi/ndi_common/ndi_common.md similarity index 100% rename from ndi_common/ndi_common.md rename to src/ndi/ndi_common/ndi_common.md diff --git a/ndi_common/ontology/ontology_list.json b/src/ndi/ndi_common/ontology/ontology_list.json similarity index 100% rename from ndi_common/ontology/ontology_list.json rename to src/ndi/ndi_common/ontology/ontology_list.json diff --git a/ndi_common/probe/probetype2object.json b/src/ndi/ndi_common/probe/probetype2object.json similarity index 100% rename from ndi_common/probe/probetype2object.json rename to src/ndi/ndi_common/probe/probetype2object.json diff --git a/ndi_common/requirements/ndi-matlab-addons.json b/src/ndi/ndi_common/requirements/ndi-matlab-addons.json similarity index 100% rename from ndi_common/requirements/ndi-matlab-addons.json rename to src/ndi/ndi_common/requirements/ndi-matlab-addons.json diff --git a/ndi_common/requirements/ndi-matlab-toolboxes.json b/src/ndi/ndi_common/requirements/ndi-matlab-toolboxes.json similarity index 100% rename from ndi_common/requirements/ndi-matlab-toolboxes.json rename to src/ndi/ndi_common/requirements/ndi-matlab-toolboxes.json diff --git a/ndi_common/resources/ndiDocumentAttributes.json b/src/ndi/ndi_common/resources/ndiDocumentAttributes.json similarity index 100% rename from ndi_common/resources/ndiDocumentAttributes.json rename to src/ndi/ndi_common/resources/ndiDocumentAttributes.json diff --git a/ndi_common/schema_documents/animalsubject_schema.json b/src/ndi/ndi_common/schema_documents/animalsubject_schema.json similarity index 100% rename from ndi_common/schema_documents/animalsubject_schema.json rename to src/ndi/ndi_common/schema_documents/animalsubject_schema.json diff --git a/ndi_common/schema_documents/app_schema.json b/src/ndi/ndi_common/schema_documents/app_schema.json similarity index 100% rename from ndi_common/schema_documents/app_schema.json rename to src/ndi/ndi_common/schema_documents/app_schema.json diff --git a/ndi_common/schema_documents/apps/calculations/simple_calc_schema.json b/src/ndi/ndi_common/schema_documents/apps/calculations/simple_calc_schema.json similarity index 100% rename from ndi_common/schema_documents/apps/calculations/simple_calc_schema.json rename to src/ndi/ndi_common/schema_documents/apps/calculations/simple_calc_schema.json diff --git a/ndi_common/schema_documents/apps/calculations/tuningcurve_calc_schema.json b/src/ndi/ndi_common/schema_documents/apps/calculations/tuningcurve_calc_schema.json similarity index 100% rename from ndi_common/schema_documents/apps/calculations/tuningcurve_calc_schema.json rename to src/ndi/ndi_common/schema_documents/apps/calculations/tuningcurve_calc_schema.json diff --git a/ndi_common/schema_documents/apps/jrclust/jrclust_clusters_schema.json b/src/ndi/ndi_common/schema_documents/apps/jrclust/jrclust_clusters_schema.json similarity index 100% rename from ndi_common/schema_documents/apps/jrclust/jrclust_clusters_schema.json rename to src/ndi/ndi_common/schema_documents/apps/jrclust/jrclust_clusters_schema.json diff --git a/ndi_common/schema_documents/apps/markgarbage/valid_interval_schema.json b/src/ndi/ndi_common/schema_documents/apps/markgarbage/valid_interval_schema.json similarity index 100% rename from ndi_common/schema_documents/apps/markgarbage/valid_interval_schema.json rename to src/ndi/ndi_common/schema_documents/apps/markgarbage/valid_interval_schema.json diff --git a/ndi_common/schema_documents/apps/spikeextractor/spike_extraction_parameters_modification_schema.json b/src/ndi/ndi_common/schema_documents/apps/spikeextractor/spike_extraction_parameters_modification_schema.json similarity index 100% rename from ndi_common/schema_documents/apps/spikeextractor/spike_extraction_parameters_modification_schema.json rename to src/ndi/ndi_common/schema_documents/apps/spikeextractor/spike_extraction_parameters_modification_schema.json diff --git a/ndi_common/schema_documents/apps/spikeextractor/spike_extraction_parameters_schema.json b/src/ndi/ndi_common/schema_documents/apps/spikeextractor/spike_extraction_parameters_schema.json similarity index 100% rename from ndi_common/schema_documents/apps/spikeextractor/spike_extraction_parameters_schema.json rename to src/ndi/ndi_common/schema_documents/apps/spikeextractor/spike_extraction_parameters_schema.json diff --git a/ndi_common/schema_documents/apps/spikeextractor/spikewaves_schema.json b/src/ndi/ndi_common/schema_documents/apps/spikeextractor/spikewaves_schema.json similarity index 100% rename from ndi_common/schema_documents/apps/spikeextractor/spikewaves_schema.json rename to src/ndi/ndi_common/schema_documents/apps/spikeextractor/spikewaves_schema.json diff --git a/ndi_common/schema_documents/apps/spikesorter/sorting_parameters_schema.json b/src/ndi/ndi_common/schema_documents/apps/spikesorter/sorting_parameters_schema.json similarity index 100% rename from ndi_common/schema_documents/apps/spikesorter/sorting_parameters_schema.json rename to src/ndi/ndi_common/schema_documents/apps/spikesorter/sorting_parameters_schema.json diff --git a/ndi_common/schema_documents/apps/spikesorter/spike_clusters_schema.json b/src/ndi/ndi_common/schema_documents/apps/spikesorter/spike_clusters_schema.json similarity index 100% rename from ndi_common/schema_documents/apps/spikesorter/spike_clusters_schema.json rename to src/ndi/ndi_common/schema_documents/apps/spikesorter/spike_clusters_schema.json diff --git a/ndi_common/schema_documents/apps/vhlab_voltage2firingrate/binnedspikeratevm_schema.json b/src/ndi/ndi_common/schema_documents/apps/vhlab_voltage2firingrate/binnedspikeratevm_schema.json similarity index 100% rename from ndi_common/schema_documents/apps/vhlab_voltage2firingrate/binnedspikeratevm_schema.json rename to src/ndi/ndi_common/schema_documents/apps/vhlab_voltage2firingrate/binnedspikeratevm_schema.json diff --git a/ndi_common/schema_documents/apps/vhlab_voltage2firingrate/vmneuralresponseresiduals_schema.json b/src/ndi/ndi_common/schema_documents/apps/vhlab_voltage2firingrate/vmneuralresponseresiduals_schema.json similarity index 100% rename from ndi_common/schema_documents/apps/vhlab_voltage2firingrate/vmneuralresponseresiduals_schema.json rename to src/ndi/ndi_common/schema_documents/apps/vhlab_voltage2firingrate/vmneuralresponseresiduals_schema.json diff --git a/ndi_common/schema_documents/apps/vhlab_voltage2firingrate/vmspikefilteringparameters_schema.json b/src/ndi/ndi_common/schema_documents/apps/vhlab_voltage2firingrate/vmspikefilteringparameters_schema.json similarity index 100% rename from ndi_common/schema_documents/apps/vhlab_voltage2firingrate/vmspikefilteringparameters_schema.json rename to src/ndi/ndi_common/schema_documents/apps/vhlab_voltage2firingrate/vmspikefilteringparameters_schema.json diff --git a/ndi_common/schema_documents/apps/vhlab_voltage2firingrate/vmspikefit_schema.json b/src/ndi/ndi_common/schema_documents/apps/vhlab_voltage2firingrate/vmspikefit_schema.json similarity index 100% rename from ndi_common/schema_documents/apps/vhlab_voltage2firingrate/vmspikefit_schema.json rename to src/ndi/ndi_common/schema_documents/apps/vhlab_voltage2firingrate/vmspikefit_schema.json diff --git a/ndi_common/schema_documents/apps/vhlab_voltage2firingrate/vmspikesummary_schema.json b/src/ndi/ndi_common/schema_documents/apps/vhlab_voltage2firingrate/vmspikesummary_schema.json similarity index 100% rename from ndi_common/schema_documents/apps/vhlab_voltage2firingrate/vmspikesummary_schema.json rename to src/ndi/ndi_common/schema_documents/apps/vhlab_voltage2firingrate/vmspikesummary_schema.json diff --git a/ndi_common/schema_documents/base_schema.json b/src/ndi/ndi_common/schema_documents/base_schema.json similarity index 100% rename from ndi_common/schema_documents/base_schema.json rename to src/ndi/ndi_common/schema_documents/base_schema.json diff --git a/ndi_common/schema_documents/daq/daqmetadatareader_schema.json b/src/ndi/ndi_common/schema_documents/daq/daqmetadatareader_schema.json similarity index 100% rename from ndi_common/schema_documents/daq/daqmetadatareader_schema.json rename to src/ndi/ndi_common/schema_documents/daq/daqmetadatareader_schema.json diff --git a/ndi_common/schema_documents/daq/daqreader_ndr_schema.json b/src/ndi/ndi_common/schema_documents/daq/daqreader_ndr_schema.json similarity index 100% rename from ndi_common/schema_documents/daq/daqreader_ndr_schema.json rename to src/ndi/ndi_common/schema_documents/daq/daqreader_ndr_schema.json diff --git a/ndi_common/schema_documents/daq/daqreader_schema.json b/src/ndi/ndi_common/schema_documents/daq/daqreader_schema.json similarity index 100% rename from ndi_common/schema_documents/daq/daqreader_schema.json rename to src/ndi/ndi_common/schema_documents/daq/daqreader_schema.json diff --git a/ndi_common/schema_documents/daq/daqsystem_schema.json b/src/ndi/ndi_common/schema_documents/daq/daqsystem_schema.json similarity index 100% rename from ndi_common/schema_documents/daq/daqsystem_schema.json rename to src/ndi/ndi_common/schema_documents/daq/daqsystem_schema.json diff --git a/ndi_common/schema_documents/daq/filenavigator_schema.json b/src/ndi/ndi_common/schema_documents/daq/filenavigator_schema.json similarity index 100% rename from ndi_common/schema_documents/daq/filenavigator_schema.json rename to src/ndi/ndi_common/schema_documents/daq/filenavigator_schema.json diff --git a/ndi_common/schema_documents/daq/syncgraph_schema.json b/src/ndi/ndi_common/schema_documents/daq/syncgraph_schema.json similarity index 100% rename from ndi_common/schema_documents/daq/syncgraph_schema.json rename to src/ndi/ndi_common/schema_documents/daq/syncgraph_schema.json diff --git a/ndi_common/schema_documents/daq/syncrule_schema.json b/src/ndi/ndi_common/schema_documents/daq/syncrule_schema.json similarity index 100% rename from ndi_common/schema_documents/daq/syncrule_schema.json rename to src/ndi/ndi_common/schema_documents/daq/syncrule_schema.json diff --git a/ndi_common/schema_documents/data/binaryseries_parameters_schema.json b/src/ndi/ndi_common/schema_documents/data/binaryseries_parameters_schema.json similarity index 100% rename from ndi_common/schema_documents/data/binaryseries_parameters_schema.json rename to src/ndi/ndi_common/schema_documents/data/binaryseries_parameters_schema.json diff --git a/ndi_common/schema_documents/data/fitcurve_schema.json b/src/ndi/ndi_common/schema_documents/data/fitcurve_schema.json similarity index 100% rename from ndi_common/schema_documents/data/fitcurve_schema.json rename to src/ndi/ndi_common/schema_documents/data/fitcurve_schema.json diff --git a/ndi_common/schema_documents/data/generic_file_schema.json b/src/ndi/ndi_common/schema_documents/data/generic_file_schema.json similarity index 100% rename from ndi_common/schema_documents/data/generic_file_schema.json rename to src/ndi/ndi_common/schema_documents/data/generic_file_schema.json diff --git a/ndi_common/schema_documents/data/imageCollection_schema.json b/src/ndi/ndi_common/schema_documents/data/imageCollection_schema.json similarity index 100% rename from ndi_common/schema_documents/data/imageCollection_schema.json rename to src/ndi/ndi_common/schema_documents/data/imageCollection_schema.json diff --git a/ndi_common/schema_documents/data/imageStack_parameters_schema.json b/src/ndi/ndi_common/schema_documents/data/imageStack_parameters_schema.json similarity index 100% rename from ndi_common/schema_documents/data/imageStack_parameters_schema.json rename to src/ndi/ndi_common/schema_documents/data/imageStack_parameters_schema.json diff --git a/ndi_common/schema_documents/data/imageStack_schema.json b/src/ndi/ndi_common/schema_documents/data/imageStack_schema.json similarity index 100% rename from ndi_common/schema_documents/data/imageStack_schema.json rename to src/ndi/ndi_common/schema_documents/data/imageStack_schema.json diff --git a/ndi_common/schema_documents/data/image_schema.json b/src/ndi/ndi_common/schema_documents/data/image_schema.json similarity index 100% rename from ndi_common/schema_documents/data/image_schema.json rename to src/ndi/ndi_common/schema_documents/data/image_schema.json diff --git a/ndi_common/schema_documents/data/ngrid_schema.json b/src/ndi/ndi_common/schema_documents/data/ngrid_schema.json similarity index 100% rename from ndi_common/schema_documents/data/ngrid_schema.json rename to src/ndi/ndi_common/schema_documents/data/ngrid_schema.json diff --git a/ndi_common/schema_documents/data/ontologyImage_schema.json b/src/ndi/ndi_common/schema_documents/data/ontologyImage_schema.json similarity index 100% rename from ndi_common/schema_documents/data/ontologyImage_schema.json rename to src/ndi/ndi_common/schema_documents/data/ontologyImage_schema.json diff --git a/ndi_common/schema_documents/data/ontologyLabel_schema.json b/src/ndi/ndi_common/schema_documents/data/ontologyLabel_schema.json similarity index 100% rename from ndi_common/schema_documents/data/ontologyLabel_schema.json rename to src/ndi/ndi_common/schema_documents/data/ontologyLabel_schema.json diff --git a/ndi_common/schema_documents/data/ontologyTableRow_schema.json b/src/ndi/ndi_common/schema_documents/data/ontologyTableRow_schema.json similarity index 100% rename from ndi_common/schema_documents/data/ontologyTableRow_schema.json rename to src/ndi/ndi_common/schema_documents/data/ontologyTableRow_schema.json diff --git a/ndi_common/schema_documents/dataset_remote_schema.json b/src/ndi/ndi_common/schema_documents/dataset_remote_schema.json similarity index 100% rename from ndi_common/schema_documents/dataset_remote_schema.json rename to src/ndi/ndi_common/schema_documents/dataset_remote_schema.json diff --git a/ndi_common/schema_documents/dataset_session_info_schema.json b/src/ndi/ndi_common/schema_documents/dataset_session_info_schema.json similarity index 100% rename from ndi_common/schema_documents/dataset_session_info_schema.json rename to src/ndi/ndi_common/schema_documents/dataset_session_info_schema.json diff --git a/ndi_common/schema_documents/demoNDI_schema.json b/src/ndi/ndi_common/schema_documents/demoNDI_schema.json similarity index 100% rename from ndi_common/schema_documents/demoNDI_schema.json rename to src/ndi/ndi_common/schema_documents/demoNDI_schema.json diff --git a/ndi_common/schema_documents/element/distance_metadata_schema.json b/src/ndi/ndi_common/schema_documents/element/distance_metadata_schema.json similarity index 100% rename from ndi_common/schema_documents/element/distance_metadata_schema.json rename to src/ndi/ndi_common/schema_documents/element/distance_metadata_schema.json diff --git a/ndi_common/schema_documents/element/position_metadata_schema.json b/src/ndi/ndi_common/schema_documents/element/position_metadata_schema.json similarity index 100% rename from ndi_common/schema_documents/element/position_metadata_schema.json rename to src/ndi/ndi_common/schema_documents/element/position_metadata_schema.json diff --git a/ndi_common/schema_documents/element_epoch_schema.json b/src/ndi/ndi_common/schema_documents/element_epoch_schema.json similarity index 100% rename from ndi_common/schema_documents/element_epoch_schema.json rename to src/ndi/ndi_common/schema_documents/element_epoch_schema.json diff --git a/ndi_common/schema_documents/element_schema.json b/src/ndi/ndi_common/schema_documents/element_schema.json similarity index 100% rename from ndi_common/schema_documents/element_schema.json rename to src/ndi/ndi_common/schema_documents/element_schema.json diff --git a/ndi_common/schema_documents/epochclocktimes_schema.json b/src/ndi/ndi_common/schema_documents/epochclocktimes_schema.json similarity index 100% rename from ndi_common/schema_documents/epochclocktimes_schema.json rename to src/ndi/ndi_common/schema_documents/epochclocktimes_schema.json diff --git a/ndi_common/schema_documents/epochid_schema.json b/src/ndi/ndi_common/schema_documents/epochid_schema.json similarity index 100% rename from ndi_common/schema_documents/epochid_schema.json rename to src/ndi/ndi_common/schema_documents/epochid_schema.json diff --git a/ndi_common/schema_documents/ingestion/daqmetadatareader_epochdata_ingested_schema.json b/src/ndi/ndi_common/schema_documents/ingestion/daqmetadatareader_epochdata_ingested_schema.json similarity index 100% rename from ndi_common/schema_documents/ingestion/daqmetadatareader_epochdata_ingested_schema.json rename to src/ndi/ndi_common/schema_documents/ingestion/daqmetadatareader_epochdata_ingested_schema.json diff --git a/ndi_common/schema_documents/ingestion/daqreader_epochdata_ingested_schema.json b/src/ndi/ndi_common/schema_documents/ingestion/daqreader_epochdata_ingested_schema.json similarity index 100% rename from ndi_common/schema_documents/ingestion/daqreader_epochdata_ingested_schema.json rename to src/ndi/ndi_common/schema_documents/ingestion/daqreader_epochdata_ingested_schema.json diff --git a/ndi_common/schema_documents/ingestion/daqreader_mfdaq_epochdata_ingested_schema.json b/src/ndi/ndi_common/schema_documents/ingestion/daqreader_mfdaq_epochdata_ingested_schema.json similarity index 100% rename from ndi_common/schema_documents/ingestion/daqreader_mfdaq_epochdata_ingested_schema.json rename to src/ndi/ndi_common/schema_documents/ingestion/daqreader_mfdaq_epochdata_ingested_schema.json diff --git a/ndi_common/schema_documents/ingestion/epochfiles_ingested_schema.json b/src/ndi/ndi_common/schema_documents/ingestion/epochfiles_ingested_schema.json similarity index 100% rename from ndi_common/schema_documents/ingestion/epochfiles_ingested_schema.json rename to src/ndi/ndi_common/schema_documents/ingestion/epochfiles_ingested_schema.json diff --git a/ndi_common/schema_documents/ingestion/metadata_editor_schema.json b/src/ndi/ndi_common/schema_documents/ingestion/metadata_editor_schema.json similarity index 100% rename from ndi_common/schema_documents/ingestion/metadata_editor_schema.json rename to src/ndi/ndi_common/schema_documents/ingestion/metadata_editor_schema.json diff --git a/ndi_common/schema_documents/ingestion/syncrule_mapping_schema.json b/src/ndi/ndi_common/schema_documents/ingestion/syncrule_mapping_schema.json similarity index 100% rename from ndi_common/schema_documents/ingestion/syncrule_mapping_schema.json rename to src/ndi/ndi_common/schema_documents/ingestion/syncrule_mapping_schema.json diff --git a/ndi_common/schema_documents/measurement_schema.json b/src/ndi/ndi_common/schema_documents/measurement_schema.json similarity index 100% rename from ndi_common/schema_documents/measurement_schema.json rename to src/ndi/ndi_common/schema_documents/measurement_schema.json diff --git a/ndi_common/schema_documents/metadata/openminds_element_schema.json b/src/ndi/ndi_common/schema_documents/metadata/openminds_element_schema.json similarity index 100% rename from ndi_common/schema_documents/metadata/openminds_element_schema.json rename to src/ndi/ndi_common/schema_documents/metadata/openminds_element_schema.json diff --git a/ndi_common/schema_documents/metadata/openminds_schema.json b/src/ndi/ndi_common/schema_documents/metadata/openminds_schema.json similarity index 100% rename from ndi_common/schema_documents/metadata/openminds_schema.json rename to src/ndi/ndi_common/schema_documents/metadata/openminds_schema.json diff --git a/ndi_common/schema_documents/metadata/openminds_stimulus_schema.json b/src/ndi/ndi_common/schema_documents/metadata/openminds_stimulus_schema.json similarity index 100% rename from ndi_common/schema_documents/metadata/openminds_stimulus_schema.json rename to src/ndi/ndi_common/schema_documents/metadata/openminds_stimulus_schema.json diff --git a/ndi_common/schema_documents/metadata/openminds_subject_schema.json b/src/ndi/ndi_common/schema_documents/metadata/openminds_subject_schema.json similarity index 100% rename from ndi_common/schema_documents/metadata/openminds_subject_schema.json rename to src/ndi/ndi_common/schema_documents/metadata/openminds_subject_schema.json diff --git a/ndi_common/schema_documents/mock/demoNDIMock.json b/src/ndi/ndi_common/schema_documents/mock/demoNDIMock.json similarity index 100% rename from ndi_common/schema_documents/mock/demoNDIMock.json rename to src/ndi/ndi_common/schema_documents/mock/demoNDIMock.json diff --git a/ndi_common/schema_documents/mock_schema.json b/src/ndi/ndi_common/schema_documents/mock_schema.json similarity index 100% rename from ndi_common/schema_documents/mock_schema.json rename to src/ndi/ndi_common/schema_documents/mock_schema.json diff --git a/ndi_common/schema_documents/neuron/neuron_extracellular_schema.json b/src/ndi/ndi_common/schema_documents/neuron/neuron_extracellular_schema.json similarity index 100% rename from ndi_common/schema_documents/neuron/neuron_extracellular_schema.json rename to src/ndi/ndi_common/schema_documents/neuron/neuron_extracellular_schema.json diff --git a/ndi_common/schema_documents/oneepoch_schema.json b/src/ndi/ndi_common/schema_documents/oneepoch_schema.json similarity index 100% rename from ndi_common/schema_documents/oneepoch_schema.json rename to src/ndi/ndi_common/schema_documents/oneepoch_schema.json diff --git a/ndi_common/schema_documents/probe/electrode_offset_voltage_schema.json b/src/ndi/ndi_common/schema_documents/probe/electrode_offset_voltage_schema.json similarity index 100% rename from ndi_common/schema_documents/probe/electrode_offset_voltage_schema.json rename to src/ndi/ndi_common/schema_documents/probe/electrode_offset_voltage_schema.json diff --git a/ndi_common/schema_documents/probe/probe_geometry_schema.json b/src/ndi/ndi_common/schema_documents/probe/probe_geometry_schema.json similarity index 100% rename from ndi_common/schema_documents/probe/probe_geometry_schema.json rename to src/ndi/ndi_common/schema_documents/probe/probe_geometry_schema.json diff --git a/ndi_common/schema_documents/probe/probe_location_schema.json b/src/ndi/ndi_common/schema_documents/probe/probe_location_schema.json similarity index 100% rename from ndi_common/schema_documents/probe/probe_location_schema.json rename to src/ndi/ndi_common/schema_documents/probe/probe_location_schema.json diff --git a/ndi_common/schema_documents/probe/site2channelmap_schema.json b/src/ndi/ndi_common/schema_documents/probe/site2channelmap_schema.json similarity index 100% rename from ndi_common/schema_documents/probe/site2channelmap_schema.json rename to src/ndi/ndi_common/schema_documents/probe/site2channelmap_schema.json diff --git a/ndi_common/schema_documents/projectvar_schema.json b/src/ndi/ndi_common/schema_documents/projectvar_schema.json similarity index 100% rename from ndi_common/schema_documents/projectvar_schema.json rename to src/ndi/ndi_common/schema_documents/projectvar_schema.json diff --git a/ndi_common/schema_documents/session_in_a_dataset_schema.json b/src/ndi/ndi_common/schema_documents/session_in_a_dataset_schema.json similarity index 100% rename from ndi_common/schema_documents/session_in_a_dataset_schema.json rename to src/ndi/ndi_common/schema_documents/session_in_a_dataset_schema.json diff --git a/ndi_common/schema_documents/session_schema.json b/src/ndi/ndi_common/schema_documents/session_schema.json similarity index 100% rename from ndi_common/schema_documents/session_schema.json rename to src/ndi/ndi_common/schema_documents/session_schema.json diff --git a/ndi_common/schema_documents/sorting/SpikeInterfaceSortingOutputs_schema.json b/src/ndi/ndi_common/schema_documents/sorting/SpikeInterfaceSortingOutputs_schema.json similarity index 100% rename from ndi_common/schema_documents/sorting/SpikeInterfaceSortingOutputs_schema.json rename to src/ndi/ndi_common/schema_documents/sorting/SpikeInterfaceSortingOutputs_schema.json diff --git a/ndi_common/schema_documents/stimulus/control_stimulus_ids_schema.json b/src/ndi/ndi_common/schema_documents/stimulus/control_stimulus_ids_schema.json similarity index 100% rename from ndi_common/schema_documents/stimulus/control_stimulus_ids_schema.json rename to src/ndi/ndi_common/schema_documents/stimulus/control_stimulus_ids_schema.json diff --git a/ndi_common/schema_documents/stimulus/stimulus_bath_schema.json b/src/ndi/ndi_common/schema_documents/stimulus/stimulus_bath_schema.json similarity index 100% rename from ndi_common/schema_documents/stimulus/stimulus_bath_schema.json rename to src/ndi/ndi_common/schema_documents/stimulus/stimulus_bath_schema.json diff --git a/ndi_common/schema_documents/stimulus/stimulus_parameter_schema.json b/src/ndi/ndi_common/schema_documents/stimulus/stimulus_parameter_schema.json similarity index 100% rename from ndi_common/schema_documents/stimulus/stimulus_parameter_schema.json rename to src/ndi/ndi_common/schema_documents/stimulus/stimulus_parameter_schema.json diff --git a/ndi_common/schema_documents/stimulus/stimulus_parameter_table_schema.json b/src/ndi/ndi_common/schema_documents/stimulus/stimulus_parameter_table_schema.json similarity index 100% rename from ndi_common/schema_documents/stimulus/stimulus_parameter_table_schema.json rename to src/ndi/ndi_common/schema_documents/stimulus/stimulus_parameter_table_schema.json diff --git a/ndi_common/schema_documents/stimulus/stimulus_presentation_schema.json b/src/ndi/ndi_common/schema_documents/stimulus/stimulus_presentation_schema.json similarity index 100% rename from ndi_common/schema_documents/stimulus/stimulus_presentation_schema.json rename to src/ndi/ndi_common/schema_documents/stimulus/stimulus_presentation_schema.json diff --git a/ndi_common/schema_documents/stimulus/stimulus_response_scalar_parameters_basic_schema.json b/src/ndi/ndi_common/schema_documents/stimulus/stimulus_response_scalar_parameters_basic_schema.json similarity index 100% rename from ndi_common/schema_documents/stimulus/stimulus_response_scalar_parameters_basic_schema.json rename to src/ndi/ndi_common/schema_documents/stimulus/stimulus_response_scalar_parameters_basic_schema.json diff --git a/ndi_common/schema_documents/stimulus/stimulus_response_scalar_parameters_schema.json b/src/ndi/ndi_common/schema_documents/stimulus/stimulus_response_scalar_parameters_schema.json similarity index 100% rename from ndi_common/schema_documents/stimulus/stimulus_response_scalar_parameters_schema.json rename to src/ndi/ndi_common/schema_documents/stimulus/stimulus_response_scalar_parameters_schema.json diff --git a/ndi_common/schema_documents/stimulus/stimulus_response_scalar_schema.json b/src/ndi/ndi_common/schema_documents/stimulus/stimulus_response_scalar_schema.json similarity index 100% rename from ndi_common/schema_documents/stimulus/stimulus_response_scalar_schema.json rename to src/ndi/ndi_common/schema_documents/stimulus/stimulus_response_scalar_schema.json diff --git a/ndi_common/schema_documents/stimulus/stimulus_response_schema.json b/src/ndi/ndi_common/schema_documents/stimulus/stimulus_response_schema.json similarity index 100% rename from ndi_common/schema_documents/stimulus/stimulus_response_schema.json rename to src/ndi/ndi_common/schema_documents/stimulus/stimulus_response_schema.json diff --git a/ndi_common/schema_documents/stimulus/stimulus_tuningcurve_schema.json b/src/ndi/ndi_common/schema_documents/stimulus/stimulus_tuningcurve_schema.json similarity index 100% rename from ndi_common/schema_documents/stimulus/stimulus_tuningcurve_schema.json rename to src/ndi/ndi_common/schema_documents/stimulus/stimulus_tuningcurve_schema.json diff --git a/ndi_common/schema_documents/stimulus/vision/oridir/orientation_direction_tuning_schema.json b/src/ndi/ndi_common/schema_documents/stimulus/vision/oridir/orientation_direction_tuning_schema.json similarity index 100% rename from ndi_common/schema_documents/stimulus/vision/oridir/orientation_direction_tuning_schema.json rename to src/ndi/ndi_common/schema_documents/stimulus/vision/oridir/orientation_direction_tuning_schema.json diff --git a/ndi_common/schema_documents/stimulus/vision/oridir/orientation_direction_tuning_schema.json_old b/src/ndi/ndi_common/schema_documents/stimulus/vision/oridir/orientation_direction_tuning_schema.json_old similarity index 100% rename from ndi_common/schema_documents/stimulus/vision/oridir/orientation_direction_tuning_schema.json_old rename to src/ndi/ndi_common/schema_documents/stimulus/vision/oridir/orientation_direction_tuning_schema.json_old diff --git a/ndi_common/schema_documents/subject_group_schema.json b/src/ndi/ndi_common/schema_documents/subject_group_schema.json similarity index 100% rename from ndi_common/schema_documents/subject_group_schema.json rename to src/ndi/ndi_common/schema_documents/subject_group_schema.json diff --git a/ndi_common/schema_documents/subject_schema.json b/src/ndi/ndi_common/schema_documents/subject_schema.json similarity index 100% rename from ndi_common/schema_documents/subject_schema.json rename to src/ndi/ndi_common/schema_documents/subject_schema.json diff --git a/ndi_common/schema_documents/subjectmeasurement_schema.json b/src/ndi/ndi_common/schema_documents/subjectmeasurement_schema.json similarity index 100% rename from ndi_common/schema_documents/subjectmeasurement_schema.json rename to src/ndi/ndi_common/schema_documents/subjectmeasurement_schema.json diff --git a/ndi_common/schema_documents/treatment/treatment_drug_schema.json b/src/ndi/ndi_common/schema_documents/treatment/treatment_drug_schema.json similarity index 100% rename from ndi_common/schema_documents/treatment/treatment_drug_schema.json rename to src/ndi/ndi_common/schema_documents/treatment/treatment_drug_schema.json diff --git a/ndi_common/schema_documents/treatment/virus_injection_schema.json b/src/ndi/ndi_common/schema_documents/treatment/virus_injection_schema.json similarity index 100% rename from ndi_common/schema_documents/treatment/virus_injection_schema.json rename to src/ndi/ndi_common/schema_documents/treatment/virus_injection_schema.json diff --git a/ndi_common/schema_documents/treatment_schema.json b/src/ndi/ndi_common/schema_documents/treatment_schema.json similarity index 100% rename from ndi_common/schema_documents/treatment_schema.json rename to src/ndi/ndi_common/schema_documents/treatment_schema.json diff --git a/ndi_common/stimulus/ndi_stimulusparameters2temporalfrequency.json b/src/ndi/ndi_common/stimulus/ndi_stimulusparameters2temporalfrequency.json similarity index 100% rename from ndi_common/stimulus/ndi_stimulusparameters2temporalfrequency.json rename to src/ndi/ndi_common/stimulus/ndi_stimulusparameters2temporalfrequency.json