diff --git a/vpr7_x2p/vpr/SRC/fpga_x2p/base/fpga_x2p_api.c b/vpr7_x2p/vpr/SRC/fpga_x2p/base/fpga_x2p_api.c
index 4cde95684..847c23742 100644
--- a/vpr7_x2p/vpr/SRC/fpga_x2p/base/fpga_x2p_api.c
+++ b/vpr7_x2p/vpr/SRC/fpga_x2p/base/fpga_x2p_api.c
@@ -31,7 +31,7 @@
 #include "fpga_bitstream.h"
 
 #include "mux_library_builder.h"
-#include "build_device_modules.h"
+#include "build_module_graph.h"
 
 #include "fpga_x2p_api.h"
 
diff --git a/vpr7_x2p/vpr/SRC/fpga_x2p/module_builder/build_device_modules.cpp b/vpr7_x2p/vpr/SRC/fpga_x2p/module_builder/build_module_graph.cpp
similarity index 82%
rename from vpr7_x2p/vpr/SRC/fpga_x2p/module_builder/build_device_modules.cpp
rename to vpr7_x2p/vpr/SRC/fpga_x2p/module_builder/build_module_graph.cpp
index bbdfb0210..d918f5940 100644
--- a/vpr7_x2p/vpr/SRC/fpga_x2p/module_builder/build_device_modules.cpp
+++ b/vpr7_x2p/vpr/SRC/fpga_x2p/module_builder/build_module_graph.cpp
@@ -10,7 +10,8 @@
 #include "spice_types.h"
 #include "fpga_x2p_utils.h"
 
-#include "build_device_modules.h"
+#include "build_essential_modules.h"
+#include "build_module_graph.h"
 
 /********************************************************************
  * The main function to be called for building module graphs 
@@ -60,7 +61,23 @@ ModuleManager build_device_module_graph(const t_vpr_setup& vpr_setup,
   config_circuit_models_sram_port_to_default_sram_model(arch.spice->circuit_lib, arch.sram_inf.verilog_sram_inf_orgz->circuit_model); 
 
   /* TODO: Build elmentary modules */
+  build_essential_modules(module_manager, arch.spice->circuit_lib);
 
+  /* TODO: Build local encoders for multiplexers, this MUST be called before multiplexer building */
+
+  /* TODO: Build multiplexer modules */
+
+  /* TODO: Build LUT modules */
+
+  /* TODO: Build wire modules */
+
+  /* TODO: Build memory modules */
+
+  /* TODO: Build grid and programmable block modules */
+
+  /* TODO: Build global routing architecture modules */
+
+  /* TODO: Build FPGA fabric top-level module */
 
   /* End time count */
   clock_t t_end = clock();
diff --git a/vpr7_x2p/vpr/SRC/fpga_x2p/module_builder/build_device_modules.h b/vpr7_x2p/vpr/SRC/fpga_x2p/module_builder/build_module_graph.h
similarity index 82%
rename from vpr7_x2p/vpr/SRC/fpga_x2p/module_builder/build_device_modules.h
rename to vpr7_x2p/vpr/SRC/fpga_x2p/module_builder/build_module_graph.h
index 91bd7b629..3e3ad5806 100644
--- a/vpr7_x2p/vpr/SRC/fpga_x2p/module_builder/build_device_modules.h
+++ b/vpr7_x2p/vpr/SRC/fpga_x2p/module_builder/build_module_graph.h
@@ -1,5 +1,5 @@
-#ifndef BUILD_DEVICE_MODULES_H
-#define BUILD_DEVICE_MODULES_H
+#ifndef BUILD_MODULE_GRAPH_H
+#define BUILD_MODULE_GRAPH_H
 
 #include "vpr_types.h"
 #include "mux_library.h"