split packages and added Connection classes