Moving some stuff around.

Signed-off-by: J. Renée Beach <splendidnoise@gmail.com>