added namespace decl
fixed packaging problems