Rework Source resolution to support nested SourceDir

Closes GH-75.