diff --git a/lib/radio/cordic/sim/Makefile.cordic_pipe_top b/lib/radio/cordic/ghdl/Makefile.cordic_pipe_top
similarity index 83%
rename from lib/radio/cordic/sim/Makefile.cordic_pipe_top
rename to lib/radio/cordic/ghdl/Makefile.cordic_pipe_top
index ba9fc46..feac5b0 100644
--- a/lib/radio/cordic/sim/Makefile.cordic_pipe_top
+++ b/lib/radio/cordic/ghdl/Makefile.cordic_pipe_top
@@ -10,7 +10,7 @@ WORK_LIB := work
 # -------------------------------------------------
 LIB_PATH := ../../../../lib
 
-SRCS := $(LIB_PATH)/fixed/fixed_util_pkg.vhd
+SRCS := $(LIB_PATH)/fixed/ieee_proposed/fixed_util_pkg.vhd
 SRCS +=	$(LIB_PATH)/PCK_FIO-2002.7/PCK_FIO_1993.vhd
 SRCS +=	$(LIB_PATH)/PCK_FIO-2002.7/PCK_FIO_1993_BODY.vhd
 SRCS += ../src/cordic_pkg.vhd
@@ -24,10 +24,10 @@ SRCS += ../src/tb_cordic_pipe_top.vhd
 # Compile
 TARGET := cordic_pipe_top
 ENTITY := tb_cordic_pipe_top
-WITH_GHW := y
-RUN_TIME := 2000us
+WITH_VCD := y
+RUN_TIME := 150us
 
-GHDL_OPTS := -P../../../../Common/sim/ieee_proposed/modelsim/build/ghdl/ieee_proposed
+GHDL_OPTS := -P$(LIB_PATH)/fixed/ieee_proposed/build/fixed_pkg/ieee_proposed
 
 include ../../../../Common/make/ghdl.mk
 # -------------------------------------------------
diff --git a/lib/radio/cordic/sim/Makefile.cordic_top b/lib/radio/cordic/ghdl/Makefile.cordic_top
similarity index 100%
rename from lib/radio/cordic/sim/Makefile.cordic_top
rename to lib/radio/cordic/ghdl/Makefile.cordic_top