Move packages where they should be