Move files into more sane locations