:cat: Before splitting Billet class