Changes Made prior to Branch

Catching up the upstream prior to Branching of a new directory structure.