Corrected use of relative paths, updated submoudles