More optimization of target structure in demo

Signed-off-by: Casey Dahlin <cdahlin@redhat.com>