Refactored build structure