Better Build-Path Management

Fixes #71