ADD: Unified header, and restructured into folder groups