Simplify directory structure#1

omalley wants to merge 2 commits intoapache:masterapache/orc:masterfrom

omalley:orc-23omalley/orc:orc-23Copy head branch name to clipboard