LIVEOAK-174: restructure a bit so it doesn't have crazy hierarhcy anymore