Reorganized and dried the structure of demo