Reorg/clean repo/split demo and src code

Clean up of repo, adding of submodules used for demo