Correct refactored package names; Add logging
Pakage names; Logging