Move stuff around for packaging