Moved directive partials to "right" place. Fixes #31