v1.12.0 - restructured