Fix #2 Organize project, add Makefile