Took Makefile fix from config branch to stop creating malformatted directory