fix paths and names to reflect new structure