Moved more dependencies up; Shortened some more paths