More organization, makefile, added very primitive combat