rework the package structure to work better in dev/deploy instances
solo, no diazo theme here unfortunately. Rework, and make sure everything has ps and qs crossed. sacrifice goats and go forth.