Move some endpoints up to the top (global) level