Merge pull request #33 from pmienk/master

Restore structure to targets lost during nonrecursive refactor.