This is the adjustment I had to make to get the warnings to go away and

I had to move some things to keep the packages 
e declarations the way Jay had them