Start removing recursive make usage (allow parallel builds)