Add some demo files, update namespacing & class names