diff --git a/pub1c-rest.py b/pub1c-rest.py
index 5198045..936c17b 100644
--- a/pub1c-rest.py
+++ b/pub1c-rest.py
@@ -10,7 +10,9 @@ from flask_cors import CORS
 from pathvalidate import is_valid_filepath
 
 from brackets import get_infobases as br_get_infobases
-from webpub1c.webpub1c import VRDConfig, ApacheConfig, urlpath_join, WebPublication
+from webpub1c.webpub.common import VRDConfig, urlpath_join
+from webpub1c.webpub.apache_config import ApacheConfig
+from webpub1c.webpub.webpublication import WebPublication
 
 apache_restart_flagfile = 'restart_apache'
 
diff --git a/webpub1c b/webpub1c
index 64c8e75..7835636 160000
--- a/webpub1c
+++ b/webpub1c
@@ -1 +1 @@
-Subproject commit 64c8e753c769126b62265549c77c65b174feeb9c
+Subproject commit 7835636398f7168611fa959eaf4af2b21a3dfc80