use non-recursive make, organization