Split up api controller before adding to it

Signed-off-by: Jesse Zhang <jz@pivotallabs.com>