Moving some scratch files around to make things cleaner.