Moving charitynet service to new architecture