[Organization] Refactor: The safe ones