Rework imports for repackaged springsecurity modules