Moved back to C style structs

Keeping it simple moved back to C structs from c++ classes