Hopefully committing to branch EfonyNotModularized. Deleting the modularized version out of the clone.