Restructuring code

Bug: 61267
Change-Id: Ie4252c691abb7e6b2637d88b1adea5ce8871497c
Merge "Restructuring code"