Moving files to simplify directory structure.