Move Search classes to /subs.

Signed-off-by: Norv <a.w.norv@gmail.com>
Use ADMINDIR.

Signed-off-by: Norv <a.w.norv@gmail.com>
Merge pull request #272 from norv/leftover_refactor

Leftover refactor