package renamed and added demos