Refactor directories, clean up identities and identities controllers :construction: