Better BuildPath Management

Fixes #59 and #64