diff --git a/examples/USER/misc/filter-corotate/data.bpti b/examples/USER/misc/filter_corotate/data.bpti
similarity index 100%
rename from examples/USER/misc/filter-corotate/data.bpti
rename to examples/USER/misc/filter_corotate/data.bpti
diff --git a/examples/USER/misc/filter-corotate/data.peptide b/examples/USER/misc/filter_corotate/data.peptide
similarity index 100%
rename from examples/USER/misc/filter-corotate/data.peptide
rename to examples/USER/misc/filter_corotate/data.peptide
diff --git a/examples/USER/misc/filter-corotate/in.bpti b/examples/USER/misc/filter_corotate/in.bpti
similarity index 100%
rename from examples/USER/misc/filter-corotate/in.bpti
rename to examples/USER/misc/filter_corotate/in.bpti
diff --git a/examples/USER/misc/filter-corotate/in.peptide b/examples/USER/misc/filter_corotate/in.peptide
similarity index 100%
rename from examples/USER/misc/filter-corotate/in.peptide
rename to examples/USER/misc/filter_corotate/in.peptide
diff --git a/examples/USER/misc/filter-corotate/log.10Mar2017.bpti.g++.1 b/examples/USER/misc/filter_corotate/log.10Mar2017.bpti.g++.1
similarity index 100%
rename from examples/USER/misc/filter-corotate/log.10Mar2017.bpti.g++.1
rename to examples/USER/misc/filter_corotate/log.10Mar2017.bpti.g++.1
diff --git a/examples/USER/misc/filter-corotate/log.10Mar2017.bpti.g++.4 b/examples/USER/misc/filter_corotate/log.10Mar2017.bpti.g++.4
similarity index 100%
rename from examples/USER/misc/filter-corotate/log.10Mar2017.bpti.g++.4
rename to examples/USER/misc/filter_corotate/log.10Mar2017.bpti.g++.4
diff --git a/examples/USER/misc/filter-corotate/log.10Mar2017.peptide.g++.1 b/examples/USER/misc/filter_corotate/log.10Mar2017.peptide.g++.1
similarity index 100%
rename from examples/USER/misc/filter-corotate/log.10Mar2017.peptide.g++.1
rename to examples/USER/misc/filter_corotate/log.10Mar2017.peptide.g++.1
diff --git a/examples/USER/misc/filter-corotate/log.10Mar2017.peptide.g++.4 b/examples/USER/misc/filter_corotate/log.10Mar2017.peptide.g++.4
similarity index 100%
rename from examples/USER/misc/filter-corotate/log.10Mar2017.peptide.g++.4
rename to examples/USER/misc/filter_corotate/log.10Mar2017.peptide.g++.4
diff --git a/examples/USER/misc/gauss-diel/data.gauss-diel b/examples/USER/misc/gauss_diel/data.gauss-diel
similarity index 100%
rename from examples/USER/misc/gauss-diel/data.gauss-diel
rename to examples/USER/misc/gauss_diel/data.gauss-diel
diff --git a/examples/USER/misc/gauss-diel/in.gauss-diel b/examples/USER/misc/gauss_diel/in.gauss-diel
similarity index 100%
rename from examples/USER/misc/gauss-diel/in.gauss-diel
rename to examples/USER/misc/gauss_diel/in.gauss-diel
diff --git a/examples/USER/misc/gauss-diel/in.gauss-diel-cg b/examples/USER/misc/gauss_diel/in.gauss-diel-cg
similarity index 100%
rename from examples/USER/misc/gauss-diel/in.gauss-diel-cg
rename to examples/USER/misc/gauss_diel/in.gauss-diel-cg
diff --git a/examples/USER/misc/gauss-diel/in.gauss-diel-split b/examples/USER/misc/gauss_diel/in.gauss-diel-split
similarity index 100%
rename from examples/USER/misc/gauss-diel/in.gauss-diel-split
rename to examples/USER/misc/gauss_diel/in.gauss-diel-split
diff --git a/examples/USER/misc/gauss-diel/log.gauss-diel b/examples/USER/misc/gauss_diel/log.gauss-diel
similarity index 100%
rename from examples/USER/misc/gauss-diel/log.gauss-diel
rename to examples/USER/misc/gauss_diel/log.gauss-diel
diff --git a/examples/USER/misc/gauss-diel/log.gauss-diel-cg b/examples/USER/misc/gauss_diel/log.gauss-diel-cg
similarity index 100%
rename from examples/USER/misc/gauss-diel/log.gauss-diel-cg
rename to examples/USER/misc/gauss_diel/log.gauss-diel-cg
diff --git a/examples/USER/misc/gauss-diel/log.gauss-diel-split b/examples/USER/misc/gauss_diel/log.gauss-diel-split
similarity index 100%
rename from examples/USER/misc/gauss-diel/log.gauss-diel-split
rename to examples/USER/misc/gauss_diel/log.gauss-diel-split
diff --git a/examples/USER/misc/i-pi/C.opt.tersoff b/examples/USER/misc/ipi/C.opt.tersoff
similarity index 100%
rename from examples/USER/misc/i-pi/C.opt.tersoff
rename to examples/USER/misc/ipi/C.opt.tersoff
diff --git a/examples/USER/misc/i-pi/README b/examples/USER/misc/ipi/README
similarity index 100%
rename from examples/USER/misc/i-pi/README
rename to examples/USER/misc/ipi/README
diff --git a/examples/USER/misc/i-pi/data.graphene b/examples/USER/misc/ipi/data.graphene
similarity index 100%
rename from examples/USER/misc/i-pi/data.graphene
rename to examples/USER/misc/ipi/data.graphene
diff --git a/examples/USER/misc/i-pi/i-pi_input.xml b/examples/USER/misc/ipi/i-pi_input.xml
similarity index 100%
rename from examples/USER/misc/i-pi/i-pi_input.xml
rename to examples/USER/misc/ipi/i-pi_input.xml
diff --git a/examples/USER/misc/i-pi/i-pi_positions.xyz b/examples/USER/misc/ipi/i-pi_positions.xyz
similarity index 100%
rename from examples/USER/misc/i-pi/i-pi_positions.xyz
rename to examples/USER/misc/ipi/i-pi_positions.xyz
diff --git a/examples/USER/misc/i-pi/in.graphene b/examples/USER/misc/ipi/in.graphene
similarity index 100%
rename from examples/USER/misc/i-pi/in.graphene
rename to examples/USER/misc/ipi/in.graphene
diff --git a/examples/USER/misc/kolmogorov-crespi/data.bilayer-graphene b/examples/USER/misc/kolmogorov_crespi/data.bilayer-graphene
similarity index 100%
rename from examples/USER/misc/kolmogorov-crespi/data.bilayer-graphene
rename to examples/USER/misc/kolmogorov_crespi/data.bilayer-graphene
diff --git a/examples/USER/misc/kolmogorov-crespi/data.graphene-adsorbant b/examples/USER/misc/kolmogorov_crespi/data.graphene-adsorbant
similarity index 100%
rename from examples/USER/misc/kolmogorov-crespi/data.graphene-adsorbant
rename to examples/USER/misc/kolmogorov_crespi/data.graphene-adsorbant
diff --git a/examples/USER/misc/kolmogorov-crespi/in.atom-diffusion b/examples/USER/misc/kolmogorov_crespi/in.atom-diffusion
similarity index 100%
rename from examples/USER/misc/kolmogorov-crespi/in.atom-diffusion
rename to examples/USER/misc/kolmogorov_crespi/in.atom-diffusion
diff --git a/examples/USER/misc/kolmogorov-crespi/in.bilayer-graphene b/examples/USER/misc/kolmogorov_crespi/in.bilayer-graphene
similarity index 100%
rename from examples/USER/misc/kolmogorov-crespi/in.bilayer-graphene
rename to examples/USER/misc/kolmogorov_crespi/in.bilayer-graphene
diff --git a/examples/USER/misc/kolmogorov-crespi/log.atom-diffusion b/examples/USER/misc/kolmogorov_crespi/log.atom-diffusion
similarity index 100%
rename from examples/USER/misc/kolmogorov-crespi/log.atom-diffusion
rename to examples/USER/misc/kolmogorov_crespi/log.atom-diffusion
diff --git a/examples/USER/misc/kolmogorov-crespi/log.bilayer-graphene b/examples/USER/misc/kolmogorov_crespi/log.bilayer-graphene
similarity index 100%
rename from examples/USER/misc/kolmogorov-crespi/log.bilayer-graphene
rename to examples/USER/misc/kolmogorov_crespi/log.bilayer-graphene