Fixes #14 move to new package