Moving dependencies properly