diff --git a/Dipolar-Gas-Simulator/+BdGSolver/solveBogoliubovdeGennesIn2D.m b/Dipolar-Gas-Simulator/+BdGSolver2D/solveBogoliubovdeGennesIn2D.m
similarity index 100%
rename from Dipolar-Gas-Simulator/+BdGSolver/solveBogoliubovdeGennesIn2D.m
rename to Dipolar-Gas-Simulator/+BdGSolver2D/solveBogoliubovdeGennesIn2D.m
diff --git a/Dipolar-Gas-Simulator/+Variational2D/@Calculator/Calculator.m b/Dipolar-Gas-Simulator/+VariationalSolver2D/@Calculator/Calculator.m
similarity index 100%
rename from Dipolar-Gas-Simulator/+Variational2D/@Calculator/Calculator.m
rename to Dipolar-Gas-Simulator/+VariationalSolver2D/@Calculator/Calculator.m
diff --git a/Dipolar-Gas-Simulator/+Variational2D/@Calculator/calculateChemicalPotential.m b/Dipolar-Gas-Simulator/+VariationalSolver2D/@Calculator/calculateChemicalPotential.m
similarity index 100%
rename from Dipolar-Gas-Simulator/+Variational2D/@Calculator/calculateChemicalPotential.m
rename to Dipolar-Gas-Simulator/+VariationalSolver2D/@Calculator/calculateChemicalPotential.m
diff --git a/Dipolar-Gas-Simulator/+Variational2D/@Calculator/calculateEnergyComponents.m b/Dipolar-Gas-Simulator/+VariationalSolver2D/@Calculator/calculateEnergyComponents.m
similarity index 100%
rename from Dipolar-Gas-Simulator/+Variational2D/@Calculator/calculateEnergyComponents.m
rename to Dipolar-Gas-Simulator/+VariationalSolver2D/@Calculator/calculateEnergyComponents.m
diff --git a/Dipolar-Gas-Simulator/+Variational2D/@Calculator/calculateNormalizedResiduals.m b/Dipolar-Gas-Simulator/+VariationalSolver2D/@Calculator/calculateNormalizedResiduals.m
similarity index 100%
rename from Dipolar-Gas-Simulator/+Variational2D/@Calculator/calculateNormalizedResiduals.m
rename to Dipolar-Gas-Simulator/+VariationalSolver2D/@Calculator/calculateNormalizedResiduals.m
diff --git a/Dipolar-Gas-Simulator/+Variational2D/@Calculator/calculateTotalEnergy.m b/Dipolar-Gas-Simulator/+VariationalSolver2D/@Calculator/calculateTotalEnergy.m
similarity index 100%
rename from Dipolar-Gas-Simulator/+Variational2D/@Calculator/calculateTotalEnergy.m
rename to Dipolar-Gas-Simulator/+VariationalSolver2D/@Calculator/calculateTotalEnergy.m
diff --git a/Dipolar-Gas-Simulator/+Variational2D/@Calculator/calculateVDkWithCutoff.m b/Dipolar-Gas-Simulator/+VariationalSolver2D/@Calculator/calculateVDkWithCutoff.m
similarity index 100%
rename from Dipolar-Gas-Simulator/+Variational2D/@Calculator/calculateVDkWithCutoff.m
rename to Dipolar-Gas-Simulator/+VariationalSolver2D/@Calculator/calculateVDkWithCutoff.m
diff --git a/Dipolar-Gas-Simulator/+Variational2D/@Calculator/calculateVariationalEnergy.m b/Dipolar-Gas-Simulator/+VariationalSolver2D/@Calculator/calculateVariationalEnergy.m
similarity index 100%
rename from Dipolar-Gas-Simulator/+Variational2D/@Calculator/calculateVariationalEnergy.m
rename to Dipolar-Gas-Simulator/+VariationalSolver2D/@Calculator/calculateVariationalEnergy.m
diff --git a/Dipolar-Gas-Simulator/+Variational2D/@Calculator/find_nk_fit.m b/Dipolar-Gas-Simulator/+VariationalSolver2D/@Calculator/find_nk_fit.m
similarity index 100%
rename from Dipolar-Gas-Simulator/+Variational2D/@Calculator/find_nk_fit.m
rename to Dipolar-Gas-Simulator/+VariationalSolver2D/@Calculator/find_nk_fit.m
diff --git a/Dipolar-Gas-Simulator/+Variational2D/@DipolarGas/DipolarGas.m b/Dipolar-Gas-Simulator/+VariationalSolver2D/@DipolarGas/DipolarGas.m
similarity index 100%
rename from Dipolar-Gas-Simulator/+Variational2D/@DipolarGas/DipolarGas.m
rename to Dipolar-Gas-Simulator/+VariationalSolver2D/@DipolarGas/DipolarGas.m
diff --git a/Dipolar-Gas-Simulator/+Variational2D/@DipolarGas/initialize.m b/Dipolar-Gas-Simulator/+VariationalSolver2D/@DipolarGas/initialize.m
similarity index 100%
rename from Dipolar-Gas-Simulator/+Variational2D/@DipolarGas/initialize.m
rename to Dipolar-Gas-Simulator/+VariationalSolver2D/@DipolarGas/initialize.m
diff --git a/Dipolar-Gas-Simulator/+Variational2D/@DipolarGas/propagateWavefunction.m b/Dipolar-Gas-Simulator/+VariationalSolver2D/@DipolarGas/propagateWavefunction.m
similarity index 100%
rename from Dipolar-Gas-Simulator/+Variational2D/@DipolarGas/propagateWavefunction.m
rename to Dipolar-Gas-Simulator/+VariationalSolver2D/@DipolarGas/propagateWavefunction.m
diff --git a/Dipolar-Gas-Simulator/+Variational2D/@DipolarGas/run.m b/Dipolar-Gas-Simulator/+VariationalSolver2D/@DipolarGas/run.m
similarity index 100%
rename from Dipolar-Gas-Simulator/+Variational2D/@DipolarGas/run.m
rename to Dipolar-Gas-Simulator/+VariationalSolver2D/@DipolarGas/run.m
diff --git a/Dipolar-Gas-Simulator/+Variational2D/@DipolarGas/setupParameters.m b/Dipolar-Gas-Simulator/+VariationalSolver2D/@DipolarGas/setupParameters.m
similarity index 100%
rename from Dipolar-Gas-Simulator/+Variational2D/@DipolarGas/setupParameters.m
rename to Dipolar-Gas-Simulator/+VariationalSolver2D/@DipolarGas/setupParameters.m
diff --git a/Dipolar-Gas-Simulator/+Variational2D/@DipolarGas/setupSpace.m b/Dipolar-Gas-Simulator/+VariationalSolver2D/@DipolarGas/setupSpace.m
similarity index 100%
rename from Dipolar-Gas-Simulator/+Variational2D/@DipolarGas/setupSpace.m
rename to Dipolar-Gas-Simulator/+VariationalSolver2D/@DipolarGas/setupSpace.m
diff --git a/Dipolar-Gas-Simulator/+Variational2D/@DipolarGas/setupWavefunction.m b/Dipolar-Gas-Simulator/+VariationalSolver2D/@DipolarGas/setupWavefunction.m
similarity index 100%
rename from Dipolar-Gas-Simulator/+Variational2D/@DipolarGas/setupWavefunction.m
rename to Dipolar-Gas-Simulator/+VariationalSolver2D/@DipolarGas/setupWavefunction.m