changed package declarations
4/17