Move some files around, fixed clang autodetection