Restructure a bit
Forgotten Cask change