Merge "Move logging related classes to logging package (1/3)" into main