update paths for current setup
small refactoring and conflict resolution