Added demo files, reorganized