Move Logger to Service
New components