Move files into subdirs so autoloading works.