added makefile, rearranged working directory a bit