changed paths to use external common code instead of local reference