Re-organized examples into non-recursive make