Some changes in the files structure