Changes to allow packaging
Changes to allow packaging