Connection class added, minor organization in packages