path changes and a bit of re-org