Rearranging packages, trying to isolate Spring a little more.
More awkward fumbling getting things dagger friendly, Meh. Not sure.