Moved shims to corresponding files.