Folder restructuring, log files update