Add custom settings and reorganize manifest

Change-Id: I8163393ecd0a292b970d1b1d6680011b40d85f71