More reorganization, more type-safety;