2.3 file reorganization

All my file cleanup changes to date.