Move user class to new file