Fixing namespace and moving dependencies

Should fix why this was breaking in staging.

Signed-off-by: Austin Vance <avance@pivotallabs.com>