Reorganizing directory structure to better match convention.