Replaced modularized version with a combined version for the EfonyNotModularized branch.