Reordered directory structure

Moving to CMake is pending.