Move packages back into the main file.