Remove source dependency to DynamicSugar, add assembly