Update to use directory model source

Fixes #4