TASK KSP-1943: Moved a few things around