More stucture and demo content