Fixing namespace and moving dependencies

Signed-off-by: Austin Vance <avance@pivotallabs.com>