fix dirs and dependencies