Changed package from core to controller