Put patches in proper dirs, cleanup components config

Change-Id: I8be53fcc926f5b0ab425b31e74fefe2c247acbec