diff --git a/vpr7_x2p/libarchfpga/SRC/include/ReadLine.h b/vpr7_x2p/libarchfpga/SRC/ReadLine.h
similarity index 100%
rename from vpr7_x2p/libarchfpga/SRC/include/ReadLine.h
rename to vpr7_x2p/libarchfpga/SRC/ReadLine.h
diff --git a/vpr7_x2p/libarchfpga/SRC/include/arch_types.h b/vpr7_x2p/libarchfpga/SRC/arch_types.h
similarity index 100%
rename from vpr7_x2p/libarchfpga/SRC/include/arch_types.h
rename to vpr7_x2p/libarchfpga/SRC/arch_types.h
diff --git a/vpr7_x2p/libarchfpga/SRC/include/arch_types_mrfpga.h b/vpr7_x2p/libarchfpga/SRC/arch_types_mrfpga.h
similarity index 100%
rename from vpr7_x2p/libarchfpga/SRC/include/arch_types_mrfpga.h
rename to vpr7_x2p/libarchfpga/SRC/arch_types_mrfpga.h
diff --git a/vpr7_x2p/libarchfpga/SRC/include/cad_types.h b/vpr7_x2p/libarchfpga/SRC/cad_types.h
similarity index 100%
rename from vpr7_x2p/libarchfpga/SRC/include/cad_types.h
rename to vpr7_x2p/libarchfpga/SRC/cad_types.h
diff --git a/vpr7_x2p/libarchfpga/SRC/fpga_spice_include/check_circuit_library.cpp b/vpr7_x2p/libarchfpga/SRC/check_circuit_library.cpp
similarity index 100%
rename from vpr7_x2p/libarchfpga/SRC/fpga_spice_include/check_circuit_library.cpp
rename to vpr7_x2p/libarchfpga/SRC/check_circuit_library.cpp
diff --git a/vpr7_x2p/libarchfpga/SRC/fpga_spice_include/check_circuit_library.h b/vpr7_x2p/libarchfpga/SRC/check_circuit_library.h
similarity index 100%
rename from vpr7_x2p/libarchfpga/SRC/fpga_spice_include/check_circuit_library.h
rename to vpr7_x2p/libarchfpga/SRC/check_circuit_library.h
diff --git a/vpr7_x2p/libarchfpga/SRC/fpga_spice_include/circuit_library.cpp b/vpr7_x2p/libarchfpga/SRC/circuit_library.cpp
similarity index 100%
rename from vpr7_x2p/libarchfpga/SRC/fpga_spice_include/circuit_library.cpp
rename to vpr7_x2p/libarchfpga/SRC/circuit_library.cpp
diff --git a/vpr7_x2p/libarchfpga/SRC/fpga_spice_include/circuit_library.h b/vpr7_x2p/libarchfpga/SRC/circuit_library.h
similarity index 100%
rename from vpr7_x2p/libarchfpga/SRC/fpga_spice_include/circuit_library.h
rename to vpr7_x2p/libarchfpga/SRC/circuit_library.h
diff --git a/vpr7_x2p/libarchfpga/SRC/fpga_spice_include/circuit_types.h b/vpr7_x2p/libarchfpga/SRC/circuit_types.h
similarity index 100%
rename from vpr7_x2p/libarchfpga/SRC/fpga_spice_include/circuit_types.h
rename to vpr7_x2p/libarchfpga/SRC/circuit_types.h
diff --git a/vpr7_x2p/libarchfpga/SRC/fpga_spice_include/device_port.cpp b/vpr7_x2p/libarchfpga/SRC/device_port.cpp
similarity index 100%
rename from vpr7_x2p/libarchfpga/SRC/fpga_spice_include/device_port.cpp
rename to vpr7_x2p/libarchfpga/SRC/device_port.cpp
diff --git a/vpr7_x2p/libarchfpga/SRC/fpga_spice_include/device_port.h b/vpr7_x2p/libarchfpga/SRC/device_port.h
similarity index 100%
rename from vpr7_x2p/libarchfpga/SRC/fpga_spice_include/device_port.h
rename to vpr7_x2p/libarchfpga/SRC/device_port.h
diff --git a/vpr7_x2p/libarchfpga/SRC/include/ezxml.h b/vpr7_x2p/libarchfpga/SRC/ezxml.h
similarity index 100%
rename from vpr7_x2p/libarchfpga/SRC/include/ezxml.h
rename to vpr7_x2p/libarchfpga/SRC/ezxml.h
diff --git a/vpr7_x2p/libarchfpga/SRC/fpga_spice_include/linkedlist.h b/vpr7_x2p/libarchfpga/SRC/linkedlist.h
similarity index 100%
rename from vpr7_x2p/libarchfpga/SRC/fpga_spice_include/linkedlist.h
rename to vpr7_x2p/libarchfpga/SRC/linkedlist.h
diff --git a/vpr7_x2p/libarchfpga/SRC/include/logic_types.h b/vpr7_x2p/libarchfpga/SRC/logic_types.h
similarity index 100%
rename from vpr7_x2p/libarchfpga/SRC/include/logic_types.h
rename to vpr7_x2p/libarchfpga/SRC/logic_types.h
diff --git a/vpr7_x2p/libarchfpga/SRC/fpga_spice_include/my_free_fwd.h b/vpr7_x2p/libarchfpga/SRC/my_free_fwd.h
similarity index 100%
rename from vpr7_x2p/libarchfpga/SRC/fpga_spice_include/my_free_fwd.h
rename to vpr7_x2p/libarchfpga/SRC/my_free_fwd.h
diff --git a/vpr7_x2p/libarchfpga/SRC/include/physical_types.h b/vpr7_x2p/libarchfpga/SRC/physical_types.h
similarity index 100%
rename from vpr7_x2p/libarchfpga/SRC/include/physical_types.h
rename to vpr7_x2p/libarchfpga/SRC/physical_types.h
diff --git a/vpr7_x2p/libarchfpga/SRC/fpga_spice_include/port_parser.cpp b/vpr7_x2p/libarchfpga/SRC/port_parser.cpp
similarity index 100%
rename from vpr7_x2p/libarchfpga/SRC/fpga_spice_include/port_parser.cpp
rename to vpr7_x2p/libarchfpga/SRC/port_parser.cpp
diff --git a/vpr7_x2p/libarchfpga/SRC/fpga_spice_include/port_parser.h b/vpr7_x2p/libarchfpga/SRC/port_parser.h
similarity index 100%
rename from vpr7_x2p/libarchfpga/SRC/fpga_spice_include/port_parser.h
rename to vpr7_x2p/libarchfpga/SRC/port_parser.h
diff --git a/vpr7_x2p/libarchfpga/SRC/include/read_xml_arch_file.h b/vpr7_x2p/libarchfpga/SRC/read_xml_arch_file.h
similarity index 100%
rename from vpr7_x2p/libarchfpga/SRC/include/read_xml_arch_file.h
rename to vpr7_x2p/libarchfpga/SRC/read_xml_arch_file.h
diff --git a/vpr7_x2p/libarchfpga/SRC/include/read_xml_mrfpga.h b/vpr7_x2p/libarchfpga/SRC/read_xml_mrfpga.h
similarity index 100%
rename from vpr7_x2p/libarchfpga/SRC/include/read_xml_mrfpga.h
rename to vpr7_x2p/libarchfpga/SRC/read_xml_mrfpga.h
diff --git a/vpr7_x2p/libarchfpga/SRC/fpga_spice_include/read_xml_spice.h b/vpr7_x2p/libarchfpga/SRC/read_xml_spice.h
similarity index 100%
rename from vpr7_x2p/libarchfpga/SRC/fpga_spice_include/read_xml_spice.h
rename to vpr7_x2p/libarchfpga/SRC/read_xml_spice.h
diff --git a/vpr7_x2p/libarchfpga/SRC/fpga_spice_include/read_xml_spice_util.h b/vpr7_x2p/libarchfpga/SRC/read_xml_spice_util.h
similarity index 100%
rename from vpr7_x2p/libarchfpga/SRC/fpga_spice_include/read_xml_spice_util.h
rename to vpr7_x2p/libarchfpga/SRC/read_xml_spice_util.h
diff --git a/vpr7_x2p/libarchfpga/SRC/include/read_xml_util.h b/vpr7_x2p/libarchfpga/SRC/read_xml_util.h
similarity index 100%
rename from vpr7_x2p/libarchfpga/SRC/include/read_xml_util.h
rename to vpr7_x2p/libarchfpga/SRC/read_xml_util.h
diff --git a/vpr7_x2p/libarchfpga/SRC/include/sides.h b/vpr7_x2p/libarchfpga/SRC/sides.h
similarity index 100%
rename from vpr7_x2p/libarchfpga/SRC/include/sides.h
rename to vpr7_x2p/libarchfpga/SRC/sides.h
diff --git a/vpr7_x2p/libarchfpga/SRC/fpga_spice_include/spice_types.h b/vpr7_x2p/libarchfpga/SRC/spice_types.h
similarity index 100%
rename from vpr7_x2p/libarchfpga/SRC/fpga_spice_include/spice_types.h
rename to vpr7_x2p/libarchfpga/SRC/spice_types.h
diff --git a/vpr7_x2p/libarchfpga/SRC/fpga_spice_include/string_token.cpp b/vpr7_x2p/libarchfpga/SRC/string_token.cpp
similarity index 100%
rename from vpr7_x2p/libarchfpga/SRC/fpga_spice_include/string_token.cpp
rename to vpr7_x2p/libarchfpga/SRC/string_token.cpp
diff --git a/vpr7_x2p/libarchfpga/SRC/fpga_spice_include/string_token.h b/vpr7_x2p/libarchfpga/SRC/string_token.h
similarity index 100%
rename from vpr7_x2p/libarchfpga/SRC/fpga_spice_include/string_token.h
rename to vpr7_x2p/libarchfpga/SRC/string_token.h
diff --git a/vpr7_x2p/libarchfpga/SRC/include/util.h b/vpr7_x2p/libarchfpga/SRC/util.h
similarity index 100%
rename from vpr7_x2p/libarchfpga/SRC/include/util.h
rename to vpr7_x2p/libarchfpga/SRC/util.h
diff --git a/vpr7_x2p/vpr/SRC/ctags_vpr_src.sh b/vpr7_x2p/vpr/SRC/ctags_vpr_src.sh
index 5a37c337a..919a90230 100755
--- a/vpr7_x2p/vpr/SRC/ctags_vpr_src.sh
+++ b/vpr7_x2p/vpr/SRC/ctags_vpr_src.sh
@@ -1,2 +1,2 @@
 rm tags
-ctags -R shell_main.c main.c ./* ../../libarchfpga/SRC/include/*.[ch] ../../libarchfpga/SRC/fpga_spice_include/*.[ch] ../../libarchfpga/SRC/*.[ch] ../../pcre/SRC/*.[ch]
+ctags -R shell_main.c main.c ./* ../../libarchfpga/SRC/*.[ch] ../../pcre/SRC/*.[ch]