Refactor build structure to easier support future targets