Reorganizing directory structure a bit.