Moved stucts back to types.h