Logging enhancements

Move logging to subfolder