updated import statements to point to proper classes