Added project_to_root_relative path; this fixes up some prefixes when adding dependencies. General cleanup and moving code around.