Moving some of the Portal Tools out of the core