Update repo structure and add demo