Add support for the new modules system to auth/ (merge from HEAD)