Added struct type validation code to sukkiri-data.
Moved some code around.