Fix subproject import paths