Changed struct definitions. removed typedef