Package and import update

All errors concerning package names and class import should be fixed
now.
One more package problem to fix