Relocate Api

Closes #50
Includes #49 (merge that first to clean this PR)