organize stuff for the d2-stepbrothers

Change-Id: Ie74b7d44d7525f62dd9d42d6588b068af6248f63