Initial repackaging complete; few little fixes made as well.