moved some files around, and started handling socket errors when creating a new connection