starting to fix package declarations