Reformatted to include demo files