Fixed puppet recepies. Added classes.

Change-Id: I44ef20b1be91f748e17675f145d396e687752cf4