Fix paths, minor reorg
2 files changed