ENH: Make compliant with standard extension layout.