Reworking project layout - demos

Rearranged demos to make project more clear as to intent.