Structure ready project

Change-Id: Ie09013f447e1e5ca284de9e5dd51402c7f3064f7