move everything back to /ext for a better PR diff