even more modular

Signed-off-by: Ryan P.C. McQuen <ryan.q@linux.com>