Manual merge of jaromil's source tree reorg commit.