Merge struct DrupalUser into DrupalServicesUser.cs