refactored package names
add logging