a bit of a directory structure refactor