Refactored logging directorey