Some file reorganizing.