Changed package name from controller to affinity