:star2: Organize sections (fixes #21) :star: