Changed paths and names.