Changed numeration of tutorials and clean-up

Change-Id: I7e839a8de8d18b7e1793b1213fce23869adf59ac