Data prep updates and cleaning/moving other files