Fixed package naming and removed enable/disable logging