package structure changed
Removed cast error