Restore structure to targets lost during nonrecursive refactor.
Merge pull request #115 from pmienk/develop

Restore structure to targets lost during nonrecursive refactor.