diff --git a/Makefile b/Makefile
index d770c3faf..f7f4fda6f 100644
--- a/Makefile
+++ b/Makefile
@@ -17,10 +17,9 @@ OS := $(shell uname -s)
 
 MODULES := \
 	$(wildcard src/ext*) \
-	src/acd \
 	src/base/abc src/base/abci src/base/cmd src/base/io src/base/main src/base/exor \
 	src/base/ver src/base/wlc src/base/wln src/base/acb src/base/bac src/base/cba src/base/pla src/base/test \
-	src/map/mapper src/map/mio src/map/super src/map/if \
+	src/map/mapper src/map/mio src/map/super src/map/if src/map/if/acd \
 	src/map/amap src/map/cov src/map/scl src/map/mpm \
 	src/misc/extra src/misc/mvc src/misc/st src/misc/util src/misc/nm \
 	src/misc/vec src/misc/hash src/misc/tim src/misc/bzlib src/misc/zlib \
@@ -55,7 +54,7 @@ endif
 
 ARCHFLAGS := $(ARCHFLAGS)
 
-OPTFLAGS  ?= -g -O
+OPTFLAGS  ?= -g -O3
 
 CFLAGS    += -std=c17 -Wall -Wno-unused-function -Wno-write-strings -Wno-sign-compare $(ARCHFLAGS)
 ifneq ($(findstring arm,$(shell uname -m)),)
diff --git a/src/acd/module.make b/src/acd/module.make
deleted file mode 100644
index b245d2c42..000000000
--- a/src/acd/module.make
+++ /dev/null
@@ -1 +0,0 @@
-SRC +=  src/acd/ac_wrapper.cpp
diff --git a/src/acd/ac_decomposition.hpp b/src/map/if/acd/ac_decomposition.hpp
similarity index 100%
rename from src/acd/ac_decomposition.hpp
rename to src/map/if/acd/ac_decomposition.hpp
diff --git a/src/acd/ac_wrapper.cpp b/src/map/if/acd/ac_wrapper.cpp
similarity index 100%
rename from src/acd/ac_wrapper.cpp
rename to src/map/if/acd/ac_wrapper.cpp
diff --git a/src/acd/ac_wrapper.h b/src/map/if/acd/ac_wrapper.h
similarity index 100%
rename from src/acd/ac_wrapper.h
rename to src/map/if/acd/ac_wrapper.h
diff --git a/src/acd/kitty_algorithm.hpp b/src/map/if/acd/kitty_algorithm.hpp
similarity index 100%
rename from src/acd/kitty_algorithm.hpp
rename to src/map/if/acd/kitty_algorithm.hpp
diff --git a/src/acd/kitty_constants.hpp b/src/map/if/acd/kitty_constants.hpp
similarity index 100%
rename from src/acd/kitty_constants.hpp
rename to src/map/if/acd/kitty_constants.hpp
diff --git a/src/acd/kitty_constructors.hpp b/src/map/if/acd/kitty_constructors.hpp
similarity index 100%
rename from src/acd/kitty_constructors.hpp
rename to src/map/if/acd/kitty_constructors.hpp
diff --git a/src/acd/kitty_dynamic_tt.hpp b/src/map/if/acd/kitty_dynamic_tt.hpp
similarity index 100%
rename from src/acd/kitty_dynamic_tt.hpp
rename to src/map/if/acd/kitty_dynamic_tt.hpp
diff --git a/src/acd/kitty_operations.hpp b/src/map/if/acd/kitty_operations.hpp
similarity index 100%
rename from src/acd/kitty_operations.hpp
rename to src/map/if/acd/kitty_operations.hpp
diff --git a/src/acd/kitty_operators.hpp b/src/map/if/acd/kitty_operators.hpp
similarity index 100%
rename from src/acd/kitty_operators.hpp
rename to src/map/if/acd/kitty_operators.hpp
diff --git a/src/acd/kitty_static_tt.hpp b/src/map/if/acd/kitty_static_tt.hpp
similarity index 100%
rename from src/acd/kitty_static_tt.hpp
rename to src/map/if/acd/kitty_static_tt.hpp
diff --git a/src/map/if/acd/module.make b/src/map/if/acd/module.make
new file mode 100644
index 000000000..33c59e830
--- /dev/null
+++ b/src/map/if/acd/module.make
@@ -0,0 +1 @@
+SRC +=  src/map/if/acd/ac_wrapper.cpp
diff --git a/src/map/if/if.h b/src/map/if/if.h
index cc4d2926b..f8c99fdf1 100644
--- a/src/map/if/if.h
+++ b/src/map/if/if.h
@@ -40,7 +40,7 @@
 #include "opt/dau/dau.h"
 #include "misc/vec/vecHash.h"
 #include "misc/vec/vecWec.h"
-#include "acd/ac_wrapper.h"
+#include "map/if/acd/ac_wrapper.h"
 
 ABC_NAMESPACE_HEADER_START