Various adjustments for new directory structure.
Further adjustments for new directory structure.
Merge pull request #1 from EOX-A/branch-1-0

Branch 1 0