Some changes in files locations