Moved some stuff around

Signed-off-by: Brian McCoy <brian@brianmccoy.me>