9 files changed, 5 insertions, 5 deletions
diff --git a/usrp2/control_lib/Makefile.srcs b/usrp2/control_lib/Makefile.srcs
index 5ae185ee8..751b40828 100644
--- a/usrp2/control_lib/Makefile.srcs
+++ b/usrp2/control_lib/Makefile.srcs
@@ -50,9 +50,4 @@ bootram.v \
 nsgpio16LE.v \
 settings_bus_16LE.v \
 atr_controller16.v \
-newfifo/fifo_pacer.v \
-newfifo/packet_generator32.v \
-newfifo/packet_generator.v \
-newfifo/packet_verifier32.v \
-newfifo/packet_verifier.v \
 ))
diff --git a/usrp2/fifo/Makefile.srcs b/usrp2/fifo/Makefile.srcs
index f0b5b7bae..c1287cd5c 100644
--- a/usrp2/fifo/Makefile.srcs
+++ b/usrp2/fifo/Makefile.srcs
@@ -28,4 +28,9 @@ fifo36_demux.v \
 packet_router.v \
 splitter36.v \
 valve36.v \
+fifo_pacer.v \
+packet_generator32.v \
+packet_generator.v \
+packet_verifier32.v \
+packet_verifier.v \
 ))
diff --git a/usrp2/control_lib/newfifo/fifo_pacer.v b/usrp2/fifo/fifo_pacer.v
index 1bf03ab6e..1bf03ab6e 100644
--- a/usrp2/control_lib/newfifo/fifo_pacer.v
+++ b/usrp2/fifo/fifo_pacer.v
diff --git a/usrp2/control_lib/newfifo/packet32_tb.v b/usrp2/fifo/packet32_tb.v
index 82bb09c29..82bb09c29 100644
--- a/usrp2/control_lib/newfifo/packet32_tb.v
+++ b/usrp2/fifo/packet32_tb.v
diff --git a/usrp2/control_lib/newfifo/packet_generator.v b/usrp2/fifo/packet_generator.v
index 6e8b45ccd..6e8b45ccd 100644
--- a/usrp2/control_lib/newfifo/packet_generator.v
+++ b/usrp2/fifo/packet_generator.v
diff --git a/usrp2/control_lib/newfifo/packet_generator32.v b/usrp2/fifo/packet_generator32.v
index 6f8004964..6f8004964 100644
--- a/usrp2/control_lib/newfifo/packet_generator32.v
+++ b/usrp2/fifo/packet_generator32.v
diff --git a/usrp2/control_lib/newfifo/packet_tb.v b/usrp2/fifo/packet_tb.v
index 3c423d2ba..3c423d2ba 100644
--- a/usrp2/control_lib/newfifo/packet_tb.v
+++ b/usrp2/fifo/packet_tb.v
diff --git a/usrp2/control_lib/newfifo/packet_verifier.v b/usrp2/fifo/packet_verifier.v
index b49ad1bbb..b49ad1bbb 100644
--- a/usrp2/control_lib/newfifo/packet_verifier.v
+++ b/usrp2/fifo/packet_verifier.v
diff --git a/usrp2/control_lib/newfifo/packet_verifier32.v b/usrp2/fifo/packet_verifier32.v
index 06a13d242..06a13d242 100644
--- a/usrp2/control_lib/newfifo/packet_verifier32.v
+++ b/usrp2/fifo/packet_verifier32.v