moved things around
created new Makefile
various changes