Converted to makefile project