Changed paths, some tidying up