Restructured package for importing into digabi-live repository.