Made the structure more distro friendly