new dirs and fix paths