demo fixes and module reorg

moved some files around and removed a file that was bugging up demo
commits