trying to make the directory structure sensible