Reorganization + switch to type-0 default