more code-shuffling into subdirs