Restructured Features packaging for better legibility