fixed issues with package declaration