Cleanup

Moved to gyp builds and cleaned up code into seperate headers