Switched to makefile build system