Moving files and adding tests for Identity.