move the files a bit and give them nicer names