Reorganizing file tree a bit.