re-organize security