Refactor User creation files