Added some yaml examples
Updated used modules
Cleanup to use variables everywhere. Part 1