diff --git a/ibl_to_nwb/updated_conversion/brainwide_map/__init__.py b/ibl_to_nwb/brainwide_map/__init__.py
similarity index 100%
rename from ibl_to_nwb/updated_conversion/brainwide_map/__init__.py
rename to ibl_to_nwb/brainwide_map/__init__.py
diff --git a/ibl_to_nwb/updated_conversion/brainwide_map/brainwide_map_metadata.yml b/ibl_to_nwb/brainwide_map/brainwide_map_metadata.yml
similarity index 100%
rename from ibl_to_nwb/updated_conversion/brainwide_map/brainwide_map_metadata.yml
rename to ibl_to_nwb/brainwide_map/brainwide_map_metadata.yml
diff --git a/ibl_to_nwb/updated_conversion/brainwide_map/brainwidemapconverter.py b/ibl_to_nwb/brainwide_map/brainwidemapconverter.py
similarity index 100%
rename from ibl_to_nwb/updated_conversion/brainwide_map/brainwidemapconverter.py
rename to ibl_to_nwb/brainwide_map/brainwidemapconverter.py
diff --git a/ibl_to_nwb/updated_conversion/brainwide_map/convert_brainwide_map.py b/ibl_to_nwb/brainwide_map/convert_brainwide_map.py
similarity index 100%
rename from ibl_to_nwb/updated_conversion/brainwide_map/convert_brainwide_map.py
rename to ibl_to_nwb/brainwide_map/convert_brainwide_map.py
diff --git a/ibl_to_nwb/updated_conversion/brainwide_map/convert_brainwide_map_parallel.py b/ibl_to_nwb/brainwide_map/convert_brainwide_map_parallel.py
similarity index 100%
rename from ibl_to_nwb/updated_conversion/brainwide_map/convert_brainwide_map_parallel.py
rename to ibl_to_nwb/brainwide_map/convert_brainwide_map_parallel.py
diff --git a/ibl_to_nwb/updated_conversion/brainwide_map/convert_brainwide_map_parallel_chunking_experiment.py b/ibl_to_nwb/brainwide_map/convert_brainwide_map_parallel_chunking_experiment.py
similarity index 100%
rename from ibl_to_nwb/updated_conversion/brainwide_map/convert_brainwide_map_parallel_chunking_experiment.py
rename to ibl_to_nwb/brainwide_map/convert_brainwide_map_parallel_chunking_experiment.py
diff --git a/ibl_to_nwb/updated_conversion/brainwide_map/convert_brainwide_map_processed_only.py b/ibl_to_nwb/brainwide_map/convert_brainwide_map_processed_only.py
similarity index 100%
rename from ibl_to_nwb/updated_conversion/brainwide_map/convert_brainwide_map_processed_only.py
rename to ibl_to_nwb/brainwide_map/convert_brainwide_map_processed_only.py
diff --git a/ibl_to_nwb/updated_conversion/brainwide_map/convert_brainwide_map_processed_only_parallel.py b/ibl_to_nwb/brainwide_map/convert_brainwide_map_processed_only_parallel.py
similarity index 100%
rename from ibl_to_nwb/updated_conversion/brainwide_map/convert_brainwide_map_processed_only_parallel.py
rename to ibl_to_nwb/brainwide_map/convert_brainwide_map_processed_only_parallel.py
diff --git a/ibl_to_nwb/updated_conversion/brainwide_map/convert_brainwide_map_raw_only_parallel.py b/ibl_to_nwb/brainwide_map/convert_brainwide_map_raw_only_parallel.py
similarity index 100%
rename from ibl_to_nwb/updated_conversion/brainwide_map/convert_brainwide_map_raw_only_parallel.py
rename to ibl_to_nwb/brainwide_map/convert_brainwide_map_raw_only_parallel.py
diff --git a/ibl_to_nwb/updated_conversion/brainwide_map/datainterfaces/__init__.py b/ibl_to_nwb/brainwide_map/datainterfaces/__init__.py
similarity index 100%
rename from ibl_to_nwb/updated_conversion/brainwide_map/datainterfaces/__init__.py
rename to ibl_to_nwb/brainwide_map/datainterfaces/__init__.py
diff --git a/ibl_to_nwb/updated_conversion/brainwide_map/datainterfaces/brainwidemaptrialsinterface.py b/ibl_to_nwb/brainwide_map/datainterfaces/brainwidemaptrialsinterface.py
similarity index 100%
rename from ibl_to_nwb/updated_conversion/brainwide_map/datainterfaces/brainwidemaptrialsinterface.py
rename to ibl_to_nwb/brainwide_map/datainterfaces/brainwidemaptrialsinterface.py
diff --git a/ibl_to_nwb/updated_conversion/__init__.py b/ibl_to_nwb/brainwide_map/metadata/__init__.py
similarity index 100%
rename from ibl_to_nwb/updated_conversion/__init__.py
rename to ibl_to_nwb/brainwide_map/metadata/__init__.py
diff --git a/ibl_to_nwb/updated_conversion/brainwide_map/metadata/trials.yml b/ibl_to_nwb/brainwide_map/metadata/trials.yml
similarity index 100%
rename from ibl_to_nwb/updated_conversion/brainwide_map/metadata/trials.yml
rename to ibl_to_nwb/brainwide_map/metadata/trials.yml
diff --git a/ibl_to_nwb/updated_conversion/datainterfaces/__init__.py b/ibl_to_nwb/datainterfaces/__init__.py
similarity index 100%
rename from ibl_to_nwb/updated_conversion/datainterfaces/__init__.py
rename to ibl_to_nwb/datainterfaces/__init__.py
diff --git a/ibl_to_nwb/updated_conversion/datainterfaces/iblposeestimationinterface.py b/ibl_to_nwb/datainterfaces/iblposeestimationinterface.py
similarity index 100%
rename from ibl_to_nwb/updated_conversion/datainterfaces/iblposeestimationinterface.py
rename to ibl_to_nwb/datainterfaces/iblposeestimationinterface.py
diff --git a/ibl_to_nwb/updated_conversion/datainterfaces/iblsortingextractor.py b/ibl_to_nwb/datainterfaces/iblsortingextractor.py
similarity index 100%
rename from ibl_to_nwb/updated_conversion/datainterfaces/iblsortingextractor.py
rename to ibl_to_nwb/datainterfaces/iblsortingextractor.py
diff --git a/ibl_to_nwb/updated_conversion/datainterfaces/iblsortinginterface.py b/ibl_to_nwb/datainterfaces/iblsortinginterface.py
similarity index 100%
rename from ibl_to_nwb/updated_conversion/datainterfaces/iblsortinginterface.py
rename to ibl_to_nwb/datainterfaces/iblsortinginterface.py
diff --git a/ibl_to_nwb/updated_conversion/datainterfaces/iblstreaminginterface.py b/ibl_to_nwb/datainterfaces/iblstreaminginterface.py
similarity index 100%
rename from ibl_to_nwb/updated_conversion/datainterfaces/iblstreaminginterface.py
rename to ibl_to_nwb/datainterfaces/iblstreaminginterface.py
diff --git a/ibl_to_nwb/updated_conversion/datainterfaces/lickinterface.py b/ibl_to_nwb/datainterfaces/lickinterface.py
similarity index 100%
rename from ibl_to_nwb/updated_conversion/datainterfaces/lickinterface.py
rename to ibl_to_nwb/datainterfaces/lickinterface.py
diff --git a/ibl_to_nwb/updated_conversion/datainterfaces/pupiltrackinginterface.py b/ibl_to_nwb/datainterfaces/pupiltrackinginterface.py
similarity index 100%
rename from ibl_to_nwb/updated_conversion/datainterfaces/pupiltrackinginterface.py
rename to ibl_to_nwb/datainterfaces/pupiltrackinginterface.py
diff --git a/ibl_to_nwb/updated_conversion/datainterfaces/roimotionenergyinterface.py b/ibl_to_nwb/datainterfaces/roimotionenergyinterface.py
similarity index 100%
rename from ibl_to_nwb/updated_conversion/datainterfaces/roimotionenergyinterface.py
rename to ibl_to_nwb/datainterfaces/roimotionenergyinterface.py
diff --git a/ibl_to_nwb/updated_conversion/datainterfaces/wheelinterface.py b/ibl_to_nwb/datainterfaces/wheelinterface.py
similarity index 100%
rename from ibl_to_nwb/updated_conversion/datainterfaces/wheelinterface.py
rename to ibl_to_nwb/datainterfaces/wheelinterface.py
diff --git a/ibl_to_nwb/updated_conversion/iblconverter.py b/ibl_to_nwb/iblconverter.py
similarity index 100%
rename from ibl_to_nwb/updated_conversion/iblconverter.py
rename to ibl_to_nwb/iblconverter.py
diff --git a/ibl_to_nwb/updated_conversion/brainwide_map/metadata/__init__.py b/ibl_to_nwb/metadata/__init__.py
similarity index 100%
rename from ibl_to_nwb/updated_conversion/brainwide_map/metadata/__init__.py
rename to ibl_to_nwb/metadata/__init__.py
diff --git a/ibl_to_nwb/updated_conversion/metadata/ecephys.yml b/ibl_to_nwb/metadata/ecephys.yml
similarity index 100%
rename from ibl_to_nwb/updated_conversion/metadata/ecephys.yml
rename to ibl_to_nwb/metadata/ecephys.yml
diff --git a/ibl_to_nwb/updated_conversion/metadata/pupils.yml b/ibl_to_nwb/metadata/pupils.yml
similarity index 100%
rename from ibl_to_nwb/updated_conversion/metadata/pupils.yml
rename to ibl_to_nwb/metadata/pupils.yml
diff --git a/ibl_to_nwb/updated_conversion/metadata/wheel.yml b/ibl_to_nwb/metadata/wheel.yml
similarity index 100%
rename from ibl_to_nwb/updated_conversion/metadata/wheel.yml
rename to ibl_to_nwb/metadata/wheel.yml
diff --git a/ibl_to_nwb/updated_conversion/metadata/__init__.py b/ibl_to_nwb/repeated_site/__init__.py
similarity index 100%
rename from ibl_to_nwb/updated_conversion/metadata/__init__.py
rename to ibl_to_nwb/repeated_site/__init__.py
diff --git a/ibl_to_nwb/updated_conversion/repeated_site/convert_repeated_site.py b/ibl_to_nwb/repeated_site/convert_repeated_site.py
similarity index 100%
rename from ibl_to_nwb/updated_conversion/repeated_site/convert_repeated_site.py
rename to ibl_to_nwb/repeated_site/convert_repeated_site.py
diff --git a/ibl_to_nwb/updated_conversion/repeated_site/experiment_metadata.yml b/ibl_to_nwb/repeated_site/experiment_metadata.yml
similarity index 100%
rename from ibl_to_nwb/updated_conversion/repeated_site/experiment_metadata.yml
rename to ibl_to_nwb/repeated_site/experiment_metadata.yml
diff --git a/ibl_to_nwb/updated_conversion/repeated_site/repeatedsitebehaviorinterface.py b/ibl_to_nwb/repeated_site/repeatedsitebehaviorinterface.py
similarity index 100%
rename from ibl_to_nwb/updated_conversion/repeated_site/repeatedsitebehaviorinterface.py
rename to ibl_to_nwb/repeated_site/repeatedsitebehaviorinterface.py
diff --git a/ibl_to_nwb/updated_conversion/repeated_site/repeatedsiteconverter.py b/ibl_to_nwb/repeated_site/repeatedsiteconverter.py
similarity index 100%
rename from ibl_to_nwb/updated_conversion/repeated_site/repeatedsiteconverter.py
rename to ibl_to_nwb/repeated_site/repeatedsiteconverter.py
diff --git a/ibl_to_nwb/updated_conversion/requirements.txt b/ibl_to_nwb/requirements.txt
similarity index 100%
rename from ibl_to_nwb/updated_conversion/requirements.txt
rename to ibl_to_nwb/requirements.txt
diff --git a/ibl_to_nwb/updated_conversion/repeated_site/__init__.py b/ibl_to_nwb/updated_conversion/repeated_site/__init__.py
deleted file mode 100644
index e69de29..0000000