Some changes in files structure