Missed some files, and reorganization