diff --git a/examples/maze/noisy_circle_maze.scad b/examples/maze/noisy_circle_maze.scad
index 32a4584f..d8a656e4 100644
--- a/examples/maze/noisy_circle_maze.scad
+++ b/examples/maze/noisy_circle_maze.scad
@@ -3,7 +3,7 @@ use <util/rand.scad>;
 use <experimental/mz_blocks.scad>;
 use <experimental/mz_walls.scad>;
 use <ptf/ptf_circle.scad>;
-use <experimental/nz_perlin2.scad>;
+use <noise/nz_perlin2.scad>;
 
 module noisy_circle_maze(start, r_blocks, block_width, wall_thickness, origin_offset, noisy_factor) {
     double_r_blocks = r_blocks * 2;
diff --git a/examples/perlin_noise_cylinder.scad b/examples/perlin_noise_cylinder.scad
index ce479b72..5beb6cac 100644
--- a/examples/perlin_noise_cylinder.scad
+++ b/examples/perlin_noise_cylinder.scad
@@ -1,6 +1,6 @@
 use <util/rand.scad>;
-use <experimental/nz_perlin2s.scad>;
-use <experimental/sf_solidify.scad>;
+use <noise/nz_perlin2s.scad>;
+use <surface/sf_solidify.scad>;
 use <ptf/ptf_bend.scad>;
 use <util/slice.scad>;
 
diff --git a/examples/voronoi/voronoi_fibonacci2.scad b/examples/voronoi/voronoi_fibonacci2.scad
index 4d065b20..affebe93 100644
--- a/examples/voronoi/voronoi_fibonacci2.scad
+++ b/examples/voronoi/voronoi_fibonacci2.scad
@@ -1,4 +1,4 @@
-use <experimental/nz_cells.scad>;
+use <noise/nz_cell.scad>;
 use <golden_spiral.scad>;
 use <function_grapher.scad>;
 use <ptf/ptf_rotate.scad>;
@@ -31,7 +31,7 @@ noised = [
     for(y = [-half_size[1]:pixel_step:half_size[1]]) 
         [
             for(x = [-half_size[0]:pixel_step:half_size[0]]) 
-            let(n = nz_cells(cells, [x, y] * height_factor) )
+            let(n = nz_cell(cells, [x, y] * height_factor) )
                 [x, y, n < half_pixel_step ? half_pixel_step : n]
         ]
 ];
diff --git a/src/experimental/demo/contours_demo.scad b/src/experimental/demo/contours_demo.scad
index 7f31ff88..6fc0b61a 100644
--- a/src/experimental/demo/contours_demo.scad
+++ b/src/experimental/demo/contours_demo.scad
@@ -1,6 +1,6 @@
 use <hull_polyline2d.scad>;
 use <util/rand.scad>;
-use <experimental/nz_perlin2.scad>;
+use <noise/nz_perlin2.scad>;
 use <contours.scad>;
 
 seed = rand(0, 256);
diff --git a/src/experimental/demo/nz_cell_demo.scad b/src/experimental/demo/nz_cell_demo.scad
index 1efbf336..3a3bfb1b 100644
--- a/src/experimental/demo/nz_cell_demo.scad
+++ b/src/experimental/demo/nz_cell_demo.scad
@@ -1,4 +1,4 @@
-use <experimental/nz_cell.scad>;
+use <noise/nz_cell.scad>;
 use <golden_spiral.scad>;
 
 size = [100, 50];
diff --git a/src/experimental/demo/nz_perlin1_demo.scad b/src/experimental/demo/nz_perlin1_demo.scad
index 417db5ec..7a67f734 100644
--- a/src/experimental/demo/nz_perlin1_demo.scad
+++ b/src/experimental/demo/nz_perlin1_demo.scad
@@ -1,8 +1,8 @@
 use <hull_polyline2d.scad>;
 use <util/rand.scad>;
 use <experimental/zip.scad>;
-use <experimental/nz_perlin1.scad>;
-use <experimental/nz_perlin1s.scad>;
+use <noise/nz_perlin1.scad>;
+use <noise/nz_perlin1s.scad>;
 
 seed = rand();
 hull_polyline2d(
diff --git a/src/experimental/demo/nz_perlin2_demo.scad b/src/experimental/demo/nz_perlin2_demo.scad
index 5c87a38e..b8fbd63b 100644
--- a/src/experimental/demo/nz_perlin2_demo.scad
+++ b/src/experimental/demo/nz_perlin2_demo.scad
@@ -1,6 +1,6 @@
 use <util/rand.scad>;
 use <function_grapher.scad>;
-use <experimental/nz_perlin2s.scad>;
+use <noise/nz_perlin2s.scad>;
 
 module demo1() {
     points = [
diff --git a/src/experimental/demo/nz_perlin3_demo.scad b/src/experimental/demo/nz_perlin3_demo.scad
index 237a301d..84354db1 100644
--- a/src/experimental/demo/nz_perlin3_demo.scad
+++ b/src/experimental/demo/nz_perlin3_demo.scad
@@ -1,6 +1,6 @@
 use <util/rand.scad>;
-use <experimental/nz_perlin2s.scad>;
-use <experimental/nz_perlin3s.scad>;
+use <noise/nz_perlin2s.scad>;
+use <noise/nz_perlin3s.scad>;
 
 module demo1() {
     for(z = [0:.2:5]) {
diff --git a/src/experimental/demo/nz_worley2_demo.scad b/src/experimental/demo/nz_worley2_demo.scad
index 431d0e3b..6587d4e3 100644
--- a/src/experimental/demo/nz_worley2_demo.scad
+++ b/src/experimental/demo/nz_worley2_demo.scad
@@ -1,4 +1,4 @@
-use <experimental/nz_worley2.scad>;
+use <noise/nz_worley2.scad>;
 use <util/dedup.scad>;
 
 size = [100, 50];
diff --git a/src/experimental/demo/nz_worley2s_demo.scad b/src/experimental/demo/nz_worley2s_demo.scad
index 0fe42ad8..7aac6981 100644
--- a/src/experimental/demo/nz_worley2s_demo.scad
+++ b/src/experimental/demo/nz_worley2s_demo.scad
@@ -1,4 +1,4 @@
-use <experimental/nz_worley2s.scad>;
+use <noise/nz_worley2s.scad>;
 use <util/dedup.scad>;
 
 size = [100, 50];
diff --git a/src/experimental/demo/nz_worley3_demo.scad b/src/experimental/demo/nz_worley3_demo.scad
index 9da1a288..a60c53f8 100644
--- a/src/experimental/demo/nz_worley3_demo.scad
+++ b/src/experimental/demo/nz_worley3_demo.scad
@@ -1,4 +1,4 @@
-use <experimental/nz_worley3.scad>;
+use <noise/nz_worley3.scad>;
 
 size = [20, 20, 20];
 cell_w = 10;
diff --git a/src/experimental/demo/nz_worley3s_demo.scad b/src/experimental/demo/nz_worley3s_demo.scad
index 9e237e9d..7fb791b1 100644
--- a/src/experimental/demo/nz_worley3s_demo.scad
+++ b/src/experimental/demo/nz_worley3s_demo.scad
@@ -1,4 +1,4 @@
-use <experimental/nz_worley3s.scad>;
+use <noise/nz_worley3s.scad>;
 use <util/dedup.scad>;
 
 size = [20, 20, 20];