updated package references and using statements