Changes on files structure