Reorganized code.  Trying out makefile