- Changed package to be like a module