slight re-org to cleanup dependencies