Moved the ESV class back to the lib folder so that both the client and the server can access