Refactor directory structure
For impending merge into central repo