Changed paths for updated structure