Added supervisor config generation
Extracted images in separate entity

Change-Id: I84ad981ef23cb8e7da057116394354f050b38ad5