Moved hockey import class to more appropriate package