Changed paths to new structure