Dir refactor baseline established (jborre10)
Merge branch 'develop' of https://github.com/christianlykke9/Zebra into develop