Moving some files around.
Cleaning up.