Update structure, add demo script