Move files around to reflect new functionality.