Restructured to reflect build env