Refactored Dist Build