Organize project and update Makefile