Moved the location of some Extensions