changed paths according to new structure