Shuffle around

Signed-off-by: Takeshi Banse <takebi@laafc.net>