Major source tree reorganisation/clean-up.