msys2-unlocker: Minor reorgs + clang-format (WIP)