Reorganizing files for simplicity.