[CLEANUP] - Refactored build process