Move CSP controller to endpoints