Initial makefile added and dir reorganized.