Followup commit to 552afa7

Add the moved files to the appropriate packages.