Removed deprecated files.
Reorgs.