Moved to Makefile build system