Moving some things around

Signed-off-by: Christian Smith <christian@senshikaze.net>