Clean up and Reorder of Features

Change-Id: Ia7e211f20541c696ec03dbb033ac92d0b3d0b075