renamed some classes and improved networking.