Moving endpoint controllers to common