9 files changed, 34 insertions, 39 deletions
diff --git a/src/base/main/libSupport.c b/src/base/main/libSupport.c
index 3c0b20c7..8c92a595 100644
--- a/src/base/main/libSupport.c
+++ b/src/base/main/libSupport.c
@@ -21,7 +21,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "abc.h"
+#include "src/base/abc/abc.h"
 #include "mainInt.h"
 
 ABC_NAMESPACE_IMPL_START
diff --git a/src/base/main/main.c b/src/base/main/main.c
index 16c6e362..27b4b0bd 100644
--- a/src/base/main/main.c
+++ b/src/base/main/main.c
@@ -18,7 +18,7 @@
 
 ***********************************************************************/
 
-#include "abc.h"
+#include "src/base/abc/abc.h"
 #include "mainInt.h"
 
 #ifdef ABC_PYTHON_EMBED
diff --git a/src/base/main/main.h b/src/base/main/main.h
index 134af6e2..33f8a110 100644
--- a/src/base/main/main.h
+++ b/src/base/main/main.h
@@ -18,30 +18,29 @@
 
 ***********************************************************************/
 
-#ifndef __MAIN_H__
-#define __MAIN_H__
+#ifndef ABC__base__main__main_h
+#define ABC__base__main__main_h
 
 
 ////////////////////////////////////////////////////////////////////////
 ///                          INCLUDES                                ///
 ////////////////////////////////////////////////////////////////////////
 
-// data structure packages
-#include "extra.h"
-#include "vec.h"
-#include "st.h"
-
 // core packages
-#include "abc.h"
-#include "gia.h"
+#include "src/base/abc/abc.h"
+#include "src/aig/gia/gia.h"
+
+// data structure packages
+#include "src/misc/vec/vec.h"
+#include "src/misc/st/st.h"
 
 ABC_NAMESPACE_HEADER_START
 // the framework containing all data
 typedef struct Abc_Frame_t_      Abc_Frame_t;
 ABC_NAMESPACE_HEADER_END
 
-#include "cmd.h"
-#include "ioAbc.h"
+#include "src/base/cmd/cmd.h"
+#include "src/base/io/ioAbc.h"
 
 ABC_NAMESPACE_HEADER_START
 
diff --git a/src/base/main/mainFrame.c b/src/base/main/mainFrame.c
index 658bc34e..d03acf28 100644
--- a/src/base/main/mainFrame.c
+++ b/src/base/main/mainFrame.c
@@ -18,9 +18,10 @@
 
 ***********************************************************************/
 
-#include "abc.h"
+#include "src/base/abc/abc.h"
 #include "mainInt.h"
-#include "dec.h"
+#include "src/bool/dec/dec.h"
+#include "src/misc/extra/extraBdd.h"
 
 
 ABC_NAMESPACE_IMPL_START
diff --git a/src/base/main/mainInit.c b/src/base/main/mainInit.c
index c15ca872..73abd548 100644
--- a/src/base/main/mainInit.c
+++ b/src/base/main/mainInit.c
@@ -18,7 +18,7 @@
 
 ***********************************************************************/
 
-#include "abc.h"
+#include "src/base/abc/abc.h"
 #include "mainInt.h"
 
 ABC_NAMESPACE_IMPL_START
diff --git a/src/base/main/mainInt.h b/src/base/main/mainInt.h
index c008fc8b..979d376c 100644
--- a/src/base/main/mainInt.h
+++ b/src/base/main/mainInt.h
@@ -18,8 +18,8 @@
 
 ***********************************************************************/
 
-#ifndef __MAIN_INT_H__
-#define __MAIN_INT_H__
+#ifndef ABC__base__main__mainInt_h
+#define ABC__base__main__mainInt_h
 
  
 ////////////////////////////////////////////////////////////////////////
@@ -27,15 +27,16 @@
 ////////////////////////////////////////////////////////////////////////
 
 #include "main.h"
-#include "tim.h"
-#include "if.h"
-#include "aig.h"
-#include "gia.h"
-#include "ssw.h"
-#include "fra.h"
-#include "nwkMerge.h"
-#include "ntlnwk.h"
-#include "ext.h"
+#include "src/misc/tim/tim.h"
+#include "src/map/if/if.h"
+#include "src/aig/aig/aig.h"
+#include "src/aig/gia/gia.h"
+#include "src/proof/ssw/ssw.h"
+#include "src/proof/fra/fra.h"
+//#include "src/aig/nwk/nwkMerge.h"
+//#include "src/aig/ntl/ntlnwk.h"
+#include "src/misc/ext/ext.h"
+#include "src/misc/extra/extraBdd.h"
 
 ABC_NAMESPACE_HEADER_START
 
@@ -89,12 +90,6 @@ struct Abc_Frame_t_
     void *          pLibVer;     // the current Verilog library
 
     // new code
-    Ntl_Man_t *     pAbc8Ntl;    // the current design
-    Nwk_Man_t *     pAbc8Nwk;    // the current mapped network
-    Aig_Man_t *     pAbc8Aig;    // the current AIG
-    If_Lib_t *      pAbc8Lib;    // the current LUT library
-    If_Lib_t *      pAbc85Lib;   // the current LUT library
-
     Gia_Man_t *     pGia;
     Gia_Man_t *     pGia2;
     Abc_Cex_t *     pCex; 
diff --git a/src/base/main/mainLib.c b/src/base/main/mainLib.c
index 39078ed9..83bae04f 100644
--- a/src/base/main/mainLib.c
+++ b/src/base/main/mainLib.c
@@ -18,7 +18,7 @@
 
 ***********************************************************************/
 
-#include "abc.h"
+#include "src/base/abc/abc.h"
 #include "mainInt.h"
 
 ABC_NAMESPACE_IMPL_START
diff --git a/src/base/main/mainMC.c b/src/base/main/mainMC.c
index 5e77db57..6d9f4c73 100644
--- a/src/base/main/mainMC.c
+++ b/src/base/main/mainMC.c
@@ -19,10 +19,10 @@
 ***********************************************************************/
 
 #include "mainInt.h"
-#include "aig.h"
-#include "saig.h"
-#include "fra.h"
-#include "ioa.h"
+#include "aig/aig/aig.h"
+#include "aig/saig/saig.h"
+#include "aig/fra/fra.h"
+#include "aig/ioa/ioa.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/base/main/mainUtils.c b/src/base/main/mainUtils.c
index c849a53d..e263bc94 100644
--- a/src/base/main/mainUtils.c
+++ b/src/base/main/mainUtils.c
@@ -18,7 +18,7 @@
 
 ***********************************************************************/
 
-#include "abc.h"
+#include "src/base/abc/abc.h"
 #include "mainInt.h"
 
 #ifndef _WIN32