all pathes adjusted
final changes