m8: organization matters

Change-Id: I4e5d15f70b1e4cb7a355d8cff0d7a8ae5c9c3c37