Move packages and improve getUserByToken