Rework of all the files structure