fix of packages p4(removeal of '-' from package pathname
fix of package declarations and import statements