Move package export to package screen, and tidy up newlines