rename package, add missing constructors