Changed a few paths to components