Some refactoring/cleanup

Change-Id: I92b1e6ff0389ea45e4ba79ddf83897da1ca81271
Moved get_right_client to it's own file, now deploy calls it to get an instance

Change-Id: Ib7cc9ef2c50521799ea66d478b261458ea52dac3
Cleanup, renamed create to clone

Change-Id: Iaf4b7ab082c7c41e96d629a7319f64081c66c242