More package changes to org.allbinary