Added connectivity module. Removed unused classes.