Move some more files to make more sense