Improved Build Structure