modified package structure some more for pip

__init__.py

@@ -1,2 +1,2 @@
 # redirection, so we can use subtree like pip
-from .cv_pubsubs import cv_webcam_pub, cv_window_sub
+from .cv_pubsubs import webcam_pub, window_sub

cv_pubsubs/window_sub/cv_window_sub.py

@@ -1,5 +1,5 @@
 import cv2
-from ..cv_webcam_pub.camctrl import CamCtrl
+from ..webcam_pub.camctrl import CamCtrl
 
 if False:
     from typing import List

setup.py

@@ -2,7 +2,7 @@ from distutils.core import setup
 
 setup(
     name= 'cv_pubsubs',
-    packages = ['cv_webcam_pub', 'cv_window_sub'],
+    packages = ['cv_pubsubs', 'cv_pubsubs.webcam_pub', 'cv_pubsubs.window_sub'],
     version='0.1',
     description='Pubsub interface for Python OpenCV',
     author='Josh Miklos',

tests_interactive/test_pub_cam.py

@@ -1,4 +1,4 @@
-import cv_pubsubs.cv_webcam_pub as w
+import cv_pubsubs.webcam_pub as w
 import unittest as ut
 
 

tests_interactive/test_sub_win.py

@@ -1,6 +1,6 @@
 import unittest as ut
-import cv_pubsubs.cv_webcam_pub as w
-from cv_pubsubs.cv_window_sub import frame_dict, sub_win_loop
+import cv_pubsubs.webcam_pub as w
+from cv_pubsubs.window_sub import frame_dict, sub_win_loop
 
 
 class TestSubWin(ut.TestCase):