added demo folder (again...) and moved some files