Frameworks: just rearrange a bit

Change-Id: If947f9efc6af5c0d0ac7ce1d0786443722c148a2