Fix broken builds with restructure.

Fixes #39.