diff --git a/fma/Makefile b/pipelined/src/fma/Makefile
similarity index 100%
rename from fma/Makefile
rename to pipelined/src/fma/Makefile
diff --git a/fma/div b/pipelined/src/fma/div
similarity index 100%
rename from fma/div
rename to pipelined/src/fma/div
diff --git a/fma/div.c b/pipelined/src/fma/div.c
similarity index 100%
rename from fma/div.c
rename to pipelined/src/fma/div.c
diff --git a/fma/fma.do b/pipelined/src/fma/fma.do
similarity index 85%
rename from fma/fma.do
rename to pipelined/src/fma/fma.do
index 40956e514..6f53eacce 100644
--- a/fma/fma.do
+++ b/pipelined/src/fma/fma.do
@@ -9,7 +9,7 @@ onbreak {resume}
 vlib worklib
 
 vlog -lint -work worklib fma16.sv testbench.sv
-vopt +acc worklib.testbench -work worklib -o testbenchopt
+vopt +acc worklib.testbench_fma16 -work worklib -o testbenchopt
 vsim -lib worklib testbenchopt
 
 add wave sim:/testbench/clk
diff --git a/fma/fma16.sv b/pipelined/src/fma/fma16.sv
similarity index 84%
rename from fma/fma16.sv
rename to pipelined/src/fma/fma16.sv
index 995483457..d2f34430a 100644
--- a/fma/fma16.sv
+++ b/pipelined/src/fma/fma16.sv
@@ -28,14 +28,14 @@ module fma16(
   logic [6:0]  re;
   logic        rs;
 
-  unpack unpack(x, y, z, xm, ym, zm, xe, ye, ze, xs, ys, zs1);  // unpack inputs
-  signadj signadj(negp, negz, xs, ys, zs1, ps, zs);             // handle negations
-  mult m(mul, xm, ym, xe, ye, pm, pe);                       // p = x * y
-  add a(add, pm, zm, pe, ze, ps, zs, rm, re, rs);             // r = z + p
-  postproc post(roundmode, rm, re, rs, result);                 // normalize, round, pack
+  unpack16 unpack(x, y, z, xm, ym, zm, xe, ye, ze, xs, ys, zs1);  // unpack inputs
+  signadj16 signadj(negp, negz, xs, ys, zs1, ps, zs);             // handle negations
+  mult16 m(mul, xm, ym, xe, ye, pm, pe);                       // p = x * y
+  add16 a(add, pm, zm, pe, ze, ps, zs, rm, re, rs);             // r = z + p
+  postproc16 post(roundmode, rm, re, rs, result);                 // normalize, round, pack
 endmodule
 
-module mult(
+module mult16(
   input  logic        mul,
   input  logic [10:0] xm, ym,
   input  logic [4:0]  xe, ye,
@@ -47,7 +47,7 @@ module mult(
   assign pe = mul ? xe + ye : {1'b0, xe};  
 endmodule
 
-module add(
+module add16(
   input  logic        add,
   input  logic [21:0] pm, 
   input  logic [10:0] zm,
@@ -75,7 +75,7 @@ module add(
   assign rs = add ? ars : ps;
 endmodule
 
-module postproc(
+module postproc16(
   input  logic [1:0] roundmode,
   input  logic [22:0] rm,
   input  logic [6:0]  re,
@@ -112,7 +112,7 @@ module postproc(
   // add special case handling for zeros, NaN, Infinity
 endmodule
 
-module signadj(
+module signadj16(
   input  logic negx, negz,
   input  logic xs, ys, zs1,
   output logic ps, zs);
@@ -121,18 +121,18 @@ module signadj(
   assign zs = zs1 ^ negz; // 
 endmodule
 
-module unpack(
+module unpack16(
   input  logic [15:0] x, y, z,
   output logic [10:0] xm, ym, zm,
   output logic [4:0]  xe, ye, ze,
   output logic        xs, ys, zs);
 
-  unpacknum upx(x, xm, xe, xs);
-  unpacknum upy(y, ym, ye, ys);
-  unpacknum upz(z, zm, ze, zs);
+  unpacknum16 upx(x, xm, xe, xs);
+  unpacknum16 upy(y, ym, ye, ys);
+  unpacknum16 upz(z, zm, ze, zs);
 endmodule
 
-module unpacknum(
+module unpacknum16(
   input logic  [15:0] num,
   output logic [10:0] m,
   output logic [4:0]  e,
diff --git a/fma/fma16_testgen b/pipelined/src/fma/fma16_testgen
similarity index 100%
rename from fma/fma16_testgen
rename to pipelined/src/fma/fma16_testgen
diff --git a/fma/fma16_testgen.c b/pipelined/src/fma/fma16_testgen.c
similarity index 100%
rename from fma/fma16_testgen.c
rename to pipelined/src/fma/fma16_testgen.c
diff --git a/fma/fma32 b/pipelined/src/fma/fma32
similarity index 100%
rename from fma/fma32
rename to pipelined/src/fma/fma32
diff --git a/fma/fma32.c b/pipelined/src/fma/fma32.c
similarity index 100%
rename from fma/fma32.c
rename to pipelined/src/fma/fma32.c
diff --git a/fma/lint-fma b/pipelined/src/fma/lint-fma
similarity index 100%
rename from fma/lint-fma
rename to pipelined/src/fma/lint-fma
diff --git a/fma/sim-fma b/pipelined/src/fma/sim-fma
similarity index 100%
rename from fma/sim-fma
rename to pipelined/src/fma/sim-fma
diff --git a/fma/testbench.sv b/pipelined/src/fma/testbench.sv
similarity index 98%
rename from fma/testbench.sv
rename to pipelined/src/fma/testbench.sv
index f37561ba8..2767c4899 100644
--- a/fma/testbench.sv
+++ b/pipelined/src/fma/testbench.sv
@@ -1,5 +1,5 @@
 /* verilator lint_off STMTDLY */
-module testbench;
+module testbench_fma16;
   logic        clk, reset;
   logic [15:0] x, y, z, rexpected, result;
   logic [7:0]  ctrl;