updated Makefile to look in the subdirectory, but move data to files/folders based on the current branch name, updated readme's to reflect this