renaming structs because of core/core.h
update core/core.h struct open brace placement