restructure directories to make it easier to do git diff across operational branches