everything merged into dann package hierarchy, continuing integration