Move some files, fix broken ones