bring structure usage - mostly - inline with actual definitions