Move code from one file to another should add required imports as well

User picture
User picture
User picture
User picture
User picture
User picture
User picture
User picture