Reorder code to be consistent accross branches This is to make future merge a bit easier. Change-Id: I1039de381d8fe7b9988b57c23d15d0cb5f2fcd32