org fragments, shifting directory structure
moving to new directory structure
got tests working again
cleaned up Makefile a bit