Reorganize identity usings