Cleaning and reorganizing files.

Nothing substantial here.