Refactored to make demos a top level module

Also added new assembly modules for cli and demos.

BZ:  https://bugzilla.redhat.com/show_bug.cgi?id=1015584