Moved into package based layout

Change-Id: Iab4b5437f1a7b3debf1b68baf71dc690c662848e
Added configurable timeout option

Change-Id: Ib0e005e96951c2b1f9461615f217e95b0f445519