Improved code structure to make upgrading engine.io core easier. Upgraded engine.io to latest version.