Removed images deletion
Removed hacks predeployment hacks with directories creations
Changed containers names

Change-Id: Ifce7d59d94037db5573bea79b439e270c2ac001a