More directory structure improvements
More directory structure improvements