Split method in Setup

Change-Id: Ibe80a090acc4a09cd94b610d8efe41a2d69631aa
Update docs

Change-Id: Ie11ee00fa812d7adca4927c071dbd0a7aeff6dbe