Biiig fixes stage 1
Restructuring code
Chacges in logging
Chacges in logging
Logs fix