Rename old files to org. Add new files so the new
rcswitch implementation works.