diff --git a/algorithms/number_theory_and_cryptography/ecdlp/elliptic_curve_discrete_log.ipynb b/algorithms/number_theory_and_cryptography/elliptic_curves/elliptic_curve_discrete_log.ipynb
similarity index 100%
rename from algorithms/number_theory_and_cryptography/ecdlp/elliptic_curve_discrete_log.ipynb
rename to algorithms/number_theory_and_cryptography/elliptic_curves/elliptic_curve_discrete_log.ipynb
diff --git a/algorithms/number_theory_and_cryptography/ecdlp/elliptic_curve_discrete_log.metadata.json b/algorithms/number_theory_and_cryptography/elliptic_curves/elliptic_curve_discrete_log.metadata.json
similarity index 100%
rename from algorithms/number_theory_and_cryptography/ecdlp/elliptic_curve_discrete_log.metadata.json
rename to algorithms/number_theory_and_cryptography/elliptic_curves/elliptic_curve_discrete_log.metadata.json
diff --git a/algorithms/number_theory_and_cryptography/ecdlp/elliptic_curve_discrete_log.qmod b/algorithms/number_theory_and_cryptography/elliptic_curves/elliptic_curve_discrete_log.qmod
similarity index 100%
rename from algorithms/number_theory_and_cryptography/ecdlp/elliptic_curve_discrete_log.qmod
rename to algorithms/number_theory_and_cryptography/elliptic_curves/elliptic_curve_discrete_log.qmod
diff --git a/algorithms/number_theory_and_cryptography/ecdlp/elliptic_curve_discrete_log.synthesis_options.json b/algorithms/number_theory_and_cryptography/elliptic_curves/elliptic_curve_discrete_log.synthesis_options.json
similarity index 100%
rename from algorithms/number_theory_and_cryptography/ecdlp/elliptic_curve_discrete_log.synthesis_options.json
rename to algorithms/number_theory_and_cryptography/elliptic_curves/elliptic_curve_discrete_log.synthesis_options.json
diff --git a/algorithms/quantum_linear_solvers/aqc/solving_qlsp_with_aqc.ipynb b/algorithms/quantum_linear_solvers/adiabatic_linear_solvers/solving_qlsp_with_aqc.ipynb
similarity index 100%
rename from algorithms/quantum_linear_solvers/aqc/solving_qlsp_with_aqc.ipynb
rename to algorithms/quantum_linear_solvers/adiabatic_linear_solvers/solving_qlsp_with_aqc.ipynb
diff --git a/algorithms/quantum_linear_solvers/aqc/solving_qlsp_with_aqc.metadata.json b/algorithms/quantum_linear_solvers/adiabatic_linear_solvers/solving_qlsp_with_aqc.metadata.json
similarity index 100%
rename from algorithms/quantum_linear_solvers/aqc/solving_qlsp_with_aqc.metadata.json
rename to algorithms/quantum_linear_solvers/adiabatic_linear_solvers/solving_qlsp_with_aqc.metadata.json
diff --git a/algorithms/quantum_phase_estimation/qpe_for_matrix.ipynb b/algorithms/quantum_phase_estimation/qpe_for_matrix/qpe_for_matrix.ipynb
similarity index 100%
rename from algorithms/quantum_phase_estimation/qpe_for_matrix.ipynb
rename to algorithms/quantum_phase_estimation/qpe_for_matrix/qpe_for_matrix.ipynb
diff --git a/algorithms/quantum_phase_estimation/qpe_for_matrix.metadata.json b/algorithms/quantum_phase_estimation/qpe_for_matrix/qpe_for_matrix.metadata.json
similarity index 100%
rename from algorithms/quantum_phase_estimation/qpe_for_matrix.metadata.json
rename to algorithms/quantum_phase_estimation/qpe_for_matrix/qpe_for_matrix.metadata.json
diff --git a/algorithms/quantum_phase_estimation/qpe_for_matrix.qmod b/algorithms/quantum_phase_estimation/qpe_for_matrix/qpe_for_matrix.qmod
similarity index 100%
rename from algorithms/quantum_phase_estimation/qpe_for_matrix.qmod
rename to algorithms/quantum_phase_estimation/qpe_for_matrix/qpe_for_matrix.qmod
diff --git a/algorithms/quantum_phase_estimation/qpe_for_matrix.synthesis_options.json b/algorithms/quantum_phase_estimation/qpe_for_matrix/qpe_for_matrix.synthesis_options.json
similarity index 100%
rename from algorithms/quantum_phase_estimation/qpe_for_matrix.synthesis_options.json
rename to algorithms/quantum_phase_estimation/qpe_for_matrix/qpe_for_matrix.synthesis_options.json
diff --git a/applications/chemistry/qpe_with_qubitization/qpe_for_molecule_with_qubitization.ipynb b/algorithms/quantum_phase_estimation/qpe_with_qubitization/qpe_for_molecule_with_qubitization.ipynb
similarity index 100%
rename from applications/chemistry/qpe_with_qubitization/qpe_for_molecule_with_qubitization.ipynb
rename to algorithms/quantum_phase_estimation/qpe_with_qubitization/qpe_for_molecule_with_qubitization.ipynb
diff --git a/applications/chemistry/qpe_with_qubitization/qpe_for_molecule_with_qubitization.metadata.json b/algorithms/quantum_phase_estimation/qpe_with_qubitization/qpe_for_molecule_with_qubitization.metadata.json
similarity index 100%
rename from applications/chemistry/qpe_with_qubitization/qpe_for_molecule_with_qubitization.metadata.json
rename to algorithms/quantum_phase_estimation/qpe_with_qubitization/qpe_for_molecule_with_qubitization.metadata.json
diff --git a/algorithms/quantum_differential_equations_solvers/hhl_lanchester/hhl_lanchester.ipynb b/applications/physical_systems/hhl_lanchester/hhl_lanchester.ipynb
similarity index 100%
rename from algorithms/quantum_differential_equations_solvers/hhl_lanchester/hhl_lanchester.ipynb
rename to applications/physical_systems/hhl_lanchester/hhl_lanchester.ipynb
diff --git a/algorithms/quantum_differential_equations_solvers/hhl_lanchester/hhl_lanchester.metadata.json b/applications/physical_systems/hhl_lanchester/hhl_lanchester.metadata.json
similarity index 100%
rename from algorithms/quantum_differential_equations_solvers/hhl_lanchester/hhl_lanchester.metadata.json
rename to applications/physical_systems/hhl_lanchester/hhl_lanchester.metadata.json