Fixing  paths to get it working again

Fixing  paths to get it working again after reorganization