files modified according to new structure