restructured the security domain classes