Changed imports for new package structure
fix logger in a fast way