Remove unneeded c helper function
Reorganize source files

Signed-off-by: Stephen Levine <slevine@pivotallabs.com>