changing folders; fixing things
more scripts
Makefile; mostly working
everything runs now
merged with master