started on a plan for new demo pkg structure