Revert "Fixed package naming and removed enable/disable logging"

This reverts commit 870e4944e6aafd34c7c81f2330fdc78fdc41c99b.