fixed demos and reorganized folders