refact(security): Complete refactoring of the security services
fix(security): Sort out the missing renames and moves that got lost in the rebase!