CF: Re-organize

Move Installer to above Interface for consistency.

Change-Id: I02813ebf13691d1b80dfc62e56aed4a64750db8c
Signed-off-by: mattmanwrx <mbloomfield87@gmail.com>
Merge "CF: Re-organize" into kk