Moved dependencies to more sensible paths.