structure changing, add logger and other dependecies