Moving dependencies to their respective modules