Base Improvements

Factored out some API objects and cleaned up the build