Change directory structure in anticipation of build system switch to cmake
Change directory structure in anticipation of build system switch to cmake