diff --git a/c_src/Makefile b/c_src/Makefile
deleted file mode 100644
index 1f80e4d..0000000
--- a/c_src/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-AllNifDirs :=$(shell ls -l | grep ^d | awk '{print $$9}')
-
-CurDir  := $(shell pwd)
-MdPriv  := $(shell mkdir -p $(CurDir)/../priv/)
-
-ECHO:
-	@echo $(AllNifDirs)
-
-all:$(AllNifDirs)
-
-$(AllNifDirs):ECHO
-	@make -C $@
-
-clean:
-	@for OneNifDir in $(AllNifDirs); do make -C $$OneNifDir clean; done
diff --git a/c_src/cq/Makefile b/c_src/cq/Makefile
deleted file mode 100644
index b5844b0..0000000
--- a/c_src/cq/Makefile
+++ /dev/null
@@ -1,73 +0,0 @@
-# Based on c_src.mk from erlang.mk by Loic Hoguin <essen@ninenines.eu>
-
-CURDIR := $(shell pwd)
-BASEDIR := $(abspath $(CURDIR))
-
-PROJECT ?= $(notdir $(BASEDIR))
-PROJECT := $(strip $(PROJECT))
-
-ERTS_INCLUDE_DIR ?= $(shell erl -noshell -s init stop -eval "io:format(\"~s/erts-~s/include/\", [code:root_dir(), erlang:system_info(version)]).")
-ERL_INTERFACE_INCLUDE_DIR ?= $(shell erl -noshell -s init stop -eval "io:format(\"~s\", [code:lib_dir(erl_interface, include)]).")
-ERL_INTERFACE_LIB_DIR ?= $(shell erl -noshell -s init stop -eval "io:format(\"~s\", [code:lib_dir(erl_interface, lib)]).")
-
-C_SRC_DIR = $(CURDIR)
-C_SRC_OUTPUT ?= $(CURDIR)/../../priv/$(PROJECT).so
-
-# System type and C compiler/flags.
-
-UNAME_SYS := $(shell uname -s)
-ifeq ($(UNAME_SYS), Darwin)
-	CC ?= cc
-	CFLAGS ?= -O3 -std=c99 -arch x86_64 -finline-functions -Wall -Wmissing-prototypes
-	CXXFLAGS ?= -O3 -arch x86_64 -finline-functions -Wall
-	LDFLAGS ?= -arch x86_64 -flat_namespace -undefined suppress
-else ifeq ($(UNAME_SYS), FreeBSD)
-	CC ?= cc
-	CFLAGS ?= -O3 -std=c99 -finline-functions -Wall -Wmissing-prototypes
-	CXXFLAGS ?= -O3 -finline-functions -Wall
-else ifeq ($(UNAME_SYS), Linux)
-	CC ?= gcc
-	CFLAGS ?= -O3 -std=c99 -finline-functions -Wall -Wmissing-prototypes
-	CXXFLAGS ?= -O3 -finline-functions -Wall
-endif
-
-CFLAGS += -fPIC -I $(ERTS_INCLUDE_DIR) -I $(ERL_INTERFACE_INCLUDE_DIR)
-CXXFLAGS += -fPIC -I $(ERTS_INCLUDE_DIR) -I $(ERL_INTERFACE_INCLUDE_DIR)
-
-LDLIBS += -L $(ERL_INTERFACE_LIB_DIR) -lerl_interface -lei
-LDFLAGS += -shared
-
-# Verbosity.
-
-c_verbose_0 = @echo " C     " $(?F);
-c_verbose = $(c_verbose_$(V))
-
-cpp_verbose_0 = @echo " CPP   " $(?F);
-cpp_verbose = $(cpp_verbose_$(V))
-
-link_verbose_0 = @echo " LD    " $(@F);
-link_verbose = $(link_verbose_$(V))
-
-SOURCES := $(shell find $(C_SRC_DIR) -type f \( -name "*.c" -o -name "*.C" -o -name "*.cc" -o -name "*.cpp" \))
-OBJECTS = $(addsuffix .o, $(basename $(SOURCES)))
-
-COMPILE_C = $(c_verbose) $(CC) $(CFLAGS) $(CPPFLAGS) -c
-COMPILE_CPP = $(cpp_verbose) $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c
-
-$(C_SRC_OUTPUT): $(OBJECTS)
-	$(link_verbose) $(CC) $(OBJECTS) $(LDFLAGS) $(LDLIBS) -o $(C_SRC_OUTPUT)
-
-%.o: %.c
-	$(COMPILE_C) $(OUTPUT_OPTION) $<
-
-%.o: %.cc
-	$(COMPILE_CPP) $(OUTPUT_OPTION) $<
-
-%.o: %.C
-	$(COMPILE_CPP) $(OUTPUT_OPTION) $<
-
-%.o: %.cpp
-	$(COMPILE_CPP) $(OUTPUT_OPTION) $<
-
-clean:
-	@rm -f $(C_SRC_OUTPUT) $(OBJECTS)
diff --git a/c_src/cq/rebar.config b/c_src/cq/rebar.config
new file mode 100644
index 0000000..c55438b
--- /dev/null
+++ b/c_src/cq/rebar.config
@@ -0,0 +1,30 @@
+{port_specs, [
+    {"../../priv/cq.so", [
+        "*.c",
+        "*.cc"
+    ]}
+]}.
+
+%% {port_env, [
+%%     {"(linux|solaris|freebsd|netbsd|openbsd|dragonfly|darwin|gnu)",
+%%         "CFLAGS", "$CFLAGS -Ic_src/ -g -Wall -flto -Werror -O3"},
+%%     {"(linux|solaris|freebsd|netbsd|openbsd|dragonfly|darwin|gnu)",
+%%         "CXXFLAGS", "$CXXFLAGS -Ic_src/ -g -Wall -flto -Werror -O3"},
+%%
+%%     {"(linux|solaris|freebsd|netbsd|openbsd|dragonfly|darwin|gnu)",
+%%         "LDFLAGS", "$LDFLAGS -flto -lstdc++"},
+%%
+%%     %% OS X Leopard flags for 64-bit
+%%     {"darwin9.*-64$", "CXXFLAGS", "-m64"},
+%%     {"darwin9.*-64$", "LDFLAGS", "-arch x86_64"},
+%%
+%%     %% OS X Snow Leopard flags for 32-bit
+%%     {"darwin10.*-32$", "CXXFLAGS", "-m32"},
+%%     {"darwin10.*-32$", "LDFLAGS", "-arch i386"},
+%%
+%%     {"win32", "CXXFLAGS", "$CXXFLAGS /O2 /DNDEBUG"}
+%% ]}.
+
+
+
+
diff --git a/c_src/cq1/Makefile b/c_src/cq1/Makefile
deleted file mode 100644
index b5844b0..0000000
--- a/c_src/cq1/Makefile
+++ /dev/null
@@ -1,73 +0,0 @@
-# Based on c_src.mk from erlang.mk by Loic Hoguin <essen@ninenines.eu>
-
-CURDIR := $(shell pwd)
-BASEDIR := $(abspath $(CURDIR))
-
-PROJECT ?= $(notdir $(BASEDIR))
-PROJECT := $(strip $(PROJECT))
-
-ERTS_INCLUDE_DIR ?= $(shell erl -noshell -s init stop -eval "io:format(\"~s/erts-~s/include/\", [code:root_dir(), erlang:system_info(version)]).")
-ERL_INTERFACE_INCLUDE_DIR ?= $(shell erl -noshell -s init stop -eval "io:format(\"~s\", [code:lib_dir(erl_interface, include)]).")
-ERL_INTERFACE_LIB_DIR ?= $(shell erl -noshell -s init stop -eval "io:format(\"~s\", [code:lib_dir(erl_interface, lib)]).")
-
-C_SRC_DIR = $(CURDIR)
-C_SRC_OUTPUT ?= $(CURDIR)/../../priv/$(PROJECT).so
-
-# System type and C compiler/flags.
-
-UNAME_SYS := $(shell uname -s)
-ifeq ($(UNAME_SYS), Darwin)
-	CC ?= cc
-	CFLAGS ?= -O3 -std=c99 -arch x86_64 -finline-functions -Wall -Wmissing-prototypes
-	CXXFLAGS ?= -O3 -arch x86_64 -finline-functions -Wall
-	LDFLAGS ?= -arch x86_64 -flat_namespace -undefined suppress
-else ifeq ($(UNAME_SYS), FreeBSD)
-	CC ?= cc
-	CFLAGS ?= -O3 -std=c99 -finline-functions -Wall -Wmissing-prototypes
-	CXXFLAGS ?= -O3 -finline-functions -Wall
-else ifeq ($(UNAME_SYS), Linux)
-	CC ?= gcc
-	CFLAGS ?= -O3 -std=c99 -finline-functions -Wall -Wmissing-prototypes
-	CXXFLAGS ?= -O3 -finline-functions -Wall
-endif
-
-CFLAGS += -fPIC -I $(ERTS_INCLUDE_DIR) -I $(ERL_INTERFACE_INCLUDE_DIR)
-CXXFLAGS += -fPIC -I $(ERTS_INCLUDE_DIR) -I $(ERL_INTERFACE_INCLUDE_DIR)
-
-LDLIBS += -L $(ERL_INTERFACE_LIB_DIR) -lerl_interface -lei
-LDFLAGS += -shared
-
-# Verbosity.
-
-c_verbose_0 = @echo " C     " $(?F);
-c_verbose = $(c_verbose_$(V))
-
-cpp_verbose_0 = @echo " CPP   " $(?F);
-cpp_verbose = $(cpp_verbose_$(V))
-
-link_verbose_0 = @echo " LD    " $(@F);
-link_verbose = $(link_verbose_$(V))
-
-SOURCES := $(shell find $(C_SRC_DIR) -type f \( -name "*.c" -o -name "*.C" -o -name "*.cc" -o -name "*.cpp" \))
-OBJECTS = $(addsuffix .o, $(basename $(SOURCES)))
-
-COMPILE_C = $(c_verbose) $(CC) $(CFLAGS) $(CPPFLAGS) -c
-COMPILE_CPP = $(cpp_verbose) $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c
-
-$(C_SRC_OUTPUT): $(OBJECTS)
-	$(link_verbose) $(CC) $(OBJECTS) $(LDFLAGS) $(LDLIBS) -o $(C_SRC_OUTPUT)
-
-%.o: %.c
-	$(COMPILE_C) $(OUTPUT_OPTION) $<
-
-%.o: %.cc
-	$(COMPILE_CPP) $(OUTPUT_OPTION) $<
-
-%.o: %.C
-	$(COMPILE_CPP) $(OUTPUT_OPTION) $<
-
-%.o: %.cpp
-	$(COMPILE_CPP) $(OUTPUT_OPTION) $<
-
-clean:
-	@rm -f $(C_SRC_OUTPUT) $(OBJECTS)
diff --git a/c_src/cq1/rebar.config b/c_src/cq1/rebar.config
new file mode 100644
index 0000000..6fd2f2c
--- /dev/null
+++ b/c_src/cq1/rebar.config
@@ -0,0 +1,26 @@
+{port_specs, [
+    {"../../priv/cq1.so", [
+        "*.c",
+        "*.cc"
+    ]}
+]}.
+
+%% {port_env, [
+%%     {"(linux|solaris|freebsd|netbsd|openbsd|dragonfly|darwin|gnu)",
+%%         "CFLAGS", "$CFLAGS -Ic_src/ -g -Wall -flto -Werror -O3"},
+%%     {"(linux|solaris|freebsd|netbsd|openbsd|dragonfly|darwin|gnu)",
+%%         "CXXFLAGS", "$CXXFLAGS -Ic_src/ -g -Wall -flto -Werror -O3"},
+%%
+%%     {"(linux|solaris|freebsd|netbsd|openbsd|dragonfly|darwin|gnu)",
+%%         "LDFLAGS", "$LDFLAGS -flto -lstdc++"},
+%%
+%%     %% OS X Leopard flags for 64-bit
+%%     {"darwin9.*-64$", "CXXFLAGS", "-m64"},
+%%     {"darwin9.*-64$", "LDFLAGS", "-arch x86_64"},
+%%
+%%     %% OS X Snow Leopard flags for 32-bit
+%%     {"darwin10.*-32$", "CXXFLAGS", "-m32"},
+%%     {"darwin10.*-32$", "LDFLAGS", "-arch i386"},
+%%
+%%     {"win32", "CXXFLAGS", "$CXXFLAGS /O2 /DNDEBUG"}
+%% ]}.
diff --git a/c_src/cq2/Makefile b/c_src/cq2/Makefile
deleted file mode 100644
index b5844b0..0000000
--- a/c_src/cq2/Makefile
+++ /dev/null
@@ -1,73 +0,0 @@
-# Based on c_src.mk from erlang.mk by Loic Hoguin <essen@ninenines.eu>
-
-CURDIR := $(shell pwd)
-BASEDIR := $(abspath $(CURDIR))
-
-PROJECT ?= $(notdir $(BASEDIR))
-PROJECT := $(strip $(PROJECT))
-
-ERTS_INCLUDE_DIR ?= $(shell erl -noshell -s init stop -eval "io:format(\"~s/erts-~s/include/\", [code:root_dir(), erlang:system_info(version)]).")
-ERL_INTERFACE_INCLUDE_DIR ?= $(shell erl -noshell -s init stop -eval "io:format(\"~s\", [code:lib_dir(erl_interface, include)]).")
-ERL_INTERFACE_LIB_DIR ?= $(shell erl -noshell -s init stop -eval "io:format(\"~s\", [code:lib_dir(erl_interface, lib)]).")
-
-C_SRC_DIR = $(CURDIR)
-C_SRC_OUTPUT ?= $(CURDIR)/../../priv/$(PROJECT).so
-
-# System type and C compiler/flags.
-
-UNAME_SYS := $(shell uname -s)
-ifeq ($(UNAME_SYS), Darwin)
-	CC ?= cc
-	CFLAGS ?= -O3 -std=c99 -arch x86_64 -finline-functions -Wall -Wmissing-prototypes
-	CXXFLAGS ?= -O3 -arch x86_64 -finline-functions -Wall
-	LDFLAGS ?= -arch x86_64 -flat_namespace -undefined suppress
-else ifeq ($(UNAME_SYS), FreeBSD)
-	CC ?= cc
-	CFLAGS ?= -O3 -std=c99 -finline-functions -Wall -Wmissing-prototypes
-	CXXFLAGS ?= -O3 -finline-functions -Wall
-else ifeq ($(UNAME_SYS), Linux)
-	CC ?= gcc
-	CFLAGS ?= -O3 -std=c99 -finline-functions -Wall -Wmissing-prototypes
-	CXXFLAGS ?= -O3 -finline-functions -Wall
-endif
-
-CFLAGS += -fPIC -I $(ERTS_INCLUDE_DIR) -I $(ERL_INTERFACE_INCLUDE_DIR)
-CXXFLAGS += -fPIC -I $(ERTS_INCLUDE_DIR) -I $(ERL_INTERFACE_INCLUDE_DIR)
-
-LDLIBS += -L $(ERL_INTERFACE_LIB_DIR) -lerl_interface -lei
-LDFLAGS += -shared
-
-# Verbosity.
-
-c_verbose_0 = @echo " C     " $(?F);
-c_verbose = $(c_verbose_$(V))
-
-cpp_verbose_0 = @echo " CPP   " $(?F);
-cpp_verbose = $(cpp_verbose_$(V))
-
-link_verbose_0 = @echo " LD    " $(@F);
-link_verbose = $(link_verbose_$(V))
-
-SOURCES := $(shell find $(C_SRC_DIR) -type f \( -name "*.c" -o -name "*.C" -o -name "*.cc" -o -name "*.cpp" \))
-OBJECTS = $(addsuffix .o, $(basename $(SOURCES)))
-
-COMPILE_C = $(c_verbose) $(CC) $(CFLAGS) $(CPPFLAGS) -c
-COMPILE_CPP = $(cpp_verbose) $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c
-
-$(C_SRC_OUTPUT): $(OBJECTS)
-	$(link_verbose) $(CC) $(OBJECTS) $(LDFLAGS) $(LDLIBS) -o $(C_SRC_OUTPUT)
-
-%.o: %.c
-	$(COMPILE_C) $(OUTPUT_OPTION) $<
-
-%.o: %.cc
-	$(COMPILE_CPP) $(OUTPUT_OPTION) $<
-
-%.o: %.C
-	$(COMPILE_CPP) $(OUTPUT_OPTION) $<
-
-%.o: %.cpp
-	$(COMPILE_CPP) $(OUTPUT_OPTION) $<
-
-clean:
-	@rm -f $(C_SRC_OUTPUT) $(OBJECTS)
diff --git a/c_src/cq2/rebar.config b/c_src/cq2/rebar.config
new file mode 100644
index 0000000..9bbec13
--- /dev/null
+++ b/c_src/cq2/rebar.config
@@ -0,0 +1,26 @@
+{port_specs, [
+    {"../../priv/cq2.so", [
+        "*.c",
+        "*.cc"
+    ]}
+]}.
+
+%% {port_env, [
+%%     {"(linux|solaris|freebsd|netbsd|openbsd|dragonfly|darwin|gnu)",
+%%         "CFLAGS", "$CFLAGS -Ic_src/ -g -Wall -flto -Werror -O3"},
+%%     {"(linux|solaris|freebsd|netbsd|openbsd|dragonfly|darwin|gnu)",
+%%         "CXXFLAGS", "$CXXFLAGS -Ic_src/ -g -Wall -flto -Werror -O3"},
+%%
+%%     {"(linux|solaris|freebsd|netbsd|openbsd|dragonfly|darwin|gnu)",
+%%         "LDFLAGS", "$LDFLAGS -flto -lstdc++"},
+%%
+%%     %% OS X Leopard flags for 64-bit
+%%     {"darwin9.*-64$", "CXXFLAGS", "-m64"},
+%%     {"darwin9.*-64$", "LDFLAGS", "-arch x86_64"},
+%%
+%%     %% OS X Snow Leopard flags for 32-bit
+%%     {"darwin10.*-32$", "CXXFLAGS", "-m32"},
+%%     {"darwin10.*-32$", "LDFLAGS", "-arch i386"},
+%%
+%%     {"win32", "CXXFLAGS", "$CXXFLAGS /O2 /DNDEBUG"}
+%% ]}.
diff --git a/c_src/erlNpc b/c_src/erlNpc
new file mode 100644
index 0000000..369ccec
Binary files /dev/null and b/c_src/erlNpc differ
diff --git a/c_src/erlNpc.cmd b/c_src/erlNpc.cmd
new file mode 100644
index 0000000..6c7a1ca
--- /dev/null
+++ b/c_src/erlNpc.cmd
@@ -0,0 +1,4 @@
+@echo off
+setlocal
+set rebarscript=%~f0
+escript.exe "%rebarscript:.cmd=%" %*
diff --git a/rebar.config b/rebar.config
index 4b556b2..bc69599 100644
--- a/rebar.config
+++ b/rebar.config
@@ -2,7 +2,7 @@
 {deps, []}.
 
 {pre_hooks,
-   [{"linux", compile, "make  -C c_src all"}]}.
+   [{"", compile, "escript c_src/erlNpc compile"}]}.
 
 {post_hooks,
-   [{"linux", clean, "make -C c_src clean"}]}.
+   [{"", clean, "escript c_src/erlNpc clean"}]}.