Try to find more useful locations for things.
Remove dupe.
API v1 gets it.
as well as v1 tests.