diff --git a/library/axi_adcfifo/Makefile b/library/xilinx/axi_adcfifo/Makefile
similarity index 85%
rename from library/axi_adcfifo/Makefile
rename to library/xilinx/axi_adcfifo/Makefile
index ce104a3bc..75a50ff56 100644
--- a/library/axi_adcfifo/Makefile
+++ b/library/xilinx/axi_adcfifo/Makefile
@@ -6,12 +6,12 @@
 ####################################################################################
 
 M_DEPS := axi_adcfifo_ip.tcl
-M_DEPS += ../scripts/adi_env.tcl
-M_DEPS += ../scripts/adi_ip.tcl
-M_DEPS += ../common/ad_mem.v
-M_DEPS += ../common/ad_mem_asym.v
-M_DEPS += ../common/up_xfer_status.v
-M_DEPS += ../common/ad_axis_inf_rx.v
+M_DEPS += ../../scripts/adi_env.tcl
+M_DEPS += ../../scripts/adi_ip.tcl
+M_DEPS += ../../common/ad_mem.v
+M_DEPS += ../../common/ad_mem_asym.v
+M_DEPS += ../../common/up_xfer_status.v
+M_DEPS += ../../common/ad_axis_inf_rx.v
 M_DEPS += axi_adcfifo_adc.v
 M_DEPS += axi_adcfifo_dma.v
 M_DEPS += axi_adcfifo_wr.v
diff --git a/library/axi_adcfifo/axi_adcfifo.v b/library/xilinx/axi_adcfifo/axi_adcfifo.v
similarity index 100%
rename from library/axi_adcfifo/axi_adcfifo.v
rename to library/xilinx/axi_adcfifo/axi_adcfifo.v
diff --git a/library/axi_adcfifo/axi_adcfifo_adc.v b/library/xilinx/axi_adcfifo/axi_adcfifo_adc.v
similarity index 100%
rename from library/axi_adcfifo/axi_adcfifo_adc.v
rename to library/xilinx/axi_adcfifo/axi_adcfifo_adc.v
diff --git a/library/axi_adcfifo/axi_adcfifo_constr.xdc b/library/xilinx/axi_adcfifo/axi_adcfifo_constr.xdc
similarity index 100%
rename from library/axi_adcfifo/axi_adcfifo_constr.xdc
rename to library/xilinx/axi_adcfifo/axi_adcfifo_constr.xdc
diff --git a/library/axi_adcfifo/axi_adcfifo_dma.v b/library/xilinx/axi_adcfifo/axi_adcfifo_dma.v
similarity index 100%
rename from library/axi_adcfifo/axi_adcfifo_dma.v
rename to library/xilinx/axi_adcfifo/axi_adcfifo_dma.v
diff --git a/library/axi_adcfifo/axi_adcfifo_ip.tcl b/library/xilinx/axi_adcfifo/axi_adcfifo_ip.tcl
similarity index 98%
rename from library/axi_adcfifo/axi_adcfifo_ip.tcl
rename to library/xilinx/axi_adcfifo/axi_adcfifo_ip.tcl
index 7343caa24..cfce4030d 100644
--- a/library/axi_adcfifo/axi_adcfifo_ip.tcl
+++ b/library/xilinx/axi_adcfifo/axi_adcfifo_ip.tcl
@@ -1,6 +1,6 @@
 # ip
 
-source ../scripts/adi_env.tcl
+source ../../scripts/adi_env.tcl
 source $ad_hdl_dir/library/scripts/adi_ip.tcl
 
 adi_ip_create axi_adcfifo
diff --git a/library/axi_adcfifo/axi_adcfifo_rd.v b/library/xilinx/axi_adcfifo/axi_adcfifo_rd.v
similarity index 100%
rename from library/axi_adcfifo/axi_adcfifo_rd.v
rename to library/xilinx/axi_adcfifo/axi_adcfifo_rd.v
diff --git a/library/axi_adcfifo/axi_adcfifo_wr.v b/library/xilinx/axi_adcfifo/axi_adcfifo_wr.v
similarity index 100%
rename from library/axi_adcfifo/axi_adcfifo_wr.v
rename to library/xilinx/axi_adcfifo/axi_adcfifo_wr.v