Rework manifests

Change-Id: I0924587a770218e9ff0b5a970320fe38d780f4ab
Signed-off-by: Paul Belanger <paul.belanger@polybeacon.com>