Moved from lib to pkg namespace