Some initial code componentization