normalize engine 2

definitions of structures are almost over...