Another clean-up, restructured files.