Path adjustments to new dir structure