Leftover refactor

Move Search API in /subs.
Add some remaining ADMINDIR uses.