Refactored to make demos a top level module.  Added new assembly modules for cli and demos.
Merge pull request #357 from EricWittmann/BZ-1015584

Refactored to make demos a top level module