Further refactoring follow-on tasks: split files that don't fit well within their directory