renamed api files and refactored to make more sense

Signed-off-by: Dave <davidajberner@gmail.com>