diff --git a/.gitignore b/.gitignore
index 45672cd..aafa9bf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,6 @@
 /cube-4.3.3.tar.gz
 /cube-4.3.4.tar.gz
 /cube-4.3.5.tar.gz
+/cubegui-4.4.tar.gz
+/cubelib-4.4.tar.gz
+/cubew-4.4.tar.gz
diff --git a/cube-nocheck.patch b/cube-nocheck.patch
index cbfaf08..c524b16 100644
--- a/cube-nocheck.patch
+++ b/cube-nocheck.patch
@@ -1,14 +1,23 @@
-diff -u /home/dlove/rpmbuild/BUILD/cube-4.3.4/src/GUI-qt/display/VersionCheckWidget.cpp\~ /home/dlove/rpmbuild/BUILD/cube-4.3.4/src/GUI-qt/display/VersionCheckWidget.cpp
---- cube-4.3.4/src/GUI-qt/display/VersionCheckWidget.cpp~	2016-04-03 00:05:37.942066948 +0100
-+++ cube-4.3.4/src/GUI-qt/display/VersionCheckWidget.cpp	2016-05-06 17:16:31.648143908 +0100
-@@ -52,7 +52,8 @@
+--- cubegui-4.4/src/GUI-qt/display/utils/VersionCheckWidget.cpp~	2018-05-08 14:39:56.336543142 +0100
++++ cubegui-4.4/src/GUI-qt/display/utils/VersionCheckWidget.cpp	2018-05-11 15:44:20.168536703 +0100
+@@ -56,19 +56,8 @@
      url              = QUrl( UPDATE_CHECK_URL );
      download         = NULL;
      update_Available = false;
 -    bool no_http = env_str2bool( getenv( "CUBE_DISABLE_HTTP_DOCS" ) );
-+    // bool no_http = env_str2bool( getenv( "CUBE_DISABLE_HTTP_DOCS" ) );
-+    bool no_http = true;
-     if ( !no_http )
+-    if ( !no_http )
      {
-         updateDescription =   tr( "Check for update is not performed yet." );
-
+-        updateDescription =   tr( "Check for update is not performed yet." );
+-        Globals::setStatusMessage( tr( "Check for new version...(I)" ) );
+-        download = new DownloadThread( url );
+-        connect( download, SIGNAL( downloadFinished( QUrl, QByteArray ) ),
+-                 this, SLOT( check( QUrl, QByteArray ) ) );
+-        QTimer::singleShot( 10000, download, SLOT( loadList() ) );
+-    }
+-    else
+-    {
+-        QString _status = tr( "Check for new version is disabled via environment variable CUBE_DISABLE_HTTP_DOCS=\"" ) + QString( getenv( "CUBE_DISABLE_HTTP_DOCS" ) ) + "\"";
++        QString _status = tr( "Check for new version is disabled" );
+         updateDescription =   _status;
+         Globals::setStatusMessage( _status );
+     }
diff --git a/cube.spec b/cube.spec
index e96b5fb..e65ec52 100644
--- a/cube.spec
+++ b/cube.spec
@@ -1,19 +1,23 @@
+%global shortv %(echo %version|awk -F. '{print $1 "." $2}')
+
 Name:           cube
-Version:        4.3.5
-Release:        4%{?dist}
+Version:        4.4
+Release:        1%{?dist}
 Summary:        CUBE Uniform Behavioral Encoding generic presentation component
 
 License:        BSD
 URL:            http://www.scalasca.org/software/cube-4.x/download.html
-Source0:        http://apps.fz-juelich.de/scalasca/releases/cube/4.3/dist/cube-%{version}.tar.gz
+Source0:        http://apps.fz-juelich.de/scalasca/releases/cube/%shortv/dist/cubegui-%{version}.tar.gz
+Source1:        http://apps.fz-juelich.de/scalasca/releases/cube/%shortv/dist/cubew-%{version}.tar.gz
+Source2:        http://apps.fz-juelich.de/scalasca/releases/cube/%shortv/dist/cubelib-%{version}.tar.gz
 # disable check for new versions
 Patch0:         cube-nocheck.patch
-# Do not wrap includes in extern "C" {}
-Patch1:         cube-extern.patch
 BuildRequires:  dbus-devel
 BuildRequires:  qt4-devel
 BuildRequires:  chrpath
 BuildRequires:  desktop-file-utils
+BuildRequires:  zlib-devel
+BuildRequires:  %{?el6:devtoolset-6-}gcc-c++
 Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
 
 %description
@@ -54,26 +58,51 @@ The %{name}-doc package contains documentation for %{name}.
 
 
 %prep
-%setup -q
+%setup -q -c
+tar fx %SOURCE0
+tar fx %SOURCE1
+tar fx %SOURCE2
+# Fiddle for cubelib not being installed when building cubegui
+cat <<+ >cubelib-config
+#!/bin/sh
+case \$1 in
+--cppflags|--cflags) printf '%s\n' -I$(pwd)/cubelib-%version/inst%_includedir/cubelib ;;
+--ldflags)  printf '%s\n' -L$(pwd)/cubelib-%version/inst%_libdir ;;
+--libs) printf '%s\n' '-lcube4 -lz' ;;
+esac
++
+chmod +x cubelib-config
+cd cubegui-%version
 %patch0 -p1
-%patch1 -p1 -b .extern
 
 
 %build
+%{?el6:. /opt/rh/devtoolset-6/enable}
+cd cubew-%version
+%configure --enable-shared --disable-static
+%make_build
+cd ../cubelib-%version
+%configure --enable-shared --disable-static
+%make_build
+# Collect it for use by cubegui
+make install DESTDIR=$(pwd)/inst
+# Wrong paths in .la cause trouble
+rm inst%_libdir/*.la
+cd ../cubegui-%version
+# We can't use --with-scorep without it installed
 %configure --disable-static \
   --disable-silent-rules \
-  --with-platform=linux
-make %{?_smp_mflags}
+  --with-platform=linux \
+  --with-cubelib-config=$(pwd)/../cubelib-config
+%make_build
 
 
 %install
-%make_install
+%make_install -C cubew-%version
+%make_install -C cubelib-%version
+%make_install -C cubegui-%version
 find %{buildroot} -name '*.la' -exec rm -f {} ';'
 
-# Install doc
-cp -p AUTHORS ChangeLog COPYING README \
-      %{buildroot}%{_defaultdocdir}/%{name}/
-
 # Register as an application to be visible in the software center
 #
 # NOTE: It would be *awesome* if this file was maintained by the upstream
@@ -152,7 +181,8 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications CUBE.desktop
 
 
 %check
-make check
+make -C cubelib-%version check || { cat test/test*/*log && false; }
+make -C cubew-%version check || { cat test/test*/*log && false; }
 
 
 %post
@@ -176,11 +206,11 @@ fi
 %postun libs -p /sbin/ldconfig
 
 %files
-%dir %{_defaultdocdir}/cube/
-%{_defaultdocdir}/cube/AUTHORS
-%{_defaultdocdir}/cube/ChangeLog
-%{_defaultdocdir}/cube/COPYING
-%{_defaultdocdir}/cube/README
+%license cubegui-%version/COPYING
+%doc cubegui-%version/AUTHORS
+%doc cubegui-%version/ChangeLog
+%doc cubegui-%version/OPEN_ISSUES
+%doc cubegui-%version/README
 %{_bindir}/cube
 %{_bindir}/cube3to4
 %{_bindir}/cube4to3
@@ -215,25 +245,36 @@ fi
 %{_datadir}/appdata/*.appdata.xml
 %{_datadir}/applications/CUBE.desktop
 %{_datadir}/icons/*
-%{_datadir}/%{name}/
+%{_datadir}/cubegui/
 
 %files libs
+%{_bindir}/cube_server
 %{_libdir}/lib%{name}*.so.7*
+%{_libdir}/lib%{name}.tools*.so.0*
+%{_datadir}/cubelib/
+%{_datadir}/cubew/
 
 %files devel
-%{_bindir}/cube-config
-%{_bindir}/cube-config-backend
-%{_bindir}/cube-config-frontend
+%{_bindir}/cubegui-config
+%{_bindir}/cubelib-config
+%{_bindir}/cubew-config
 %{_includedir}/%{name}*/
 %{_libdir}/lib%{name}*.so
 %{_libdir}/libgraphwidgetcommon-plugin.so
-%{_defaultdocdir}/cube/example/
+%doc cubegui-%version/examples
 
 %files doc
-%{_defaultdocdir}/cube/
+%doc %_docdir/cubew
+%doc %_docdir/cubelib
+%doc %_docdir/cubegui
 
 
 %changelog
+* Mon May 14 2018 Dave Love <loveshack@fedoraproject.org> - 4.4-1
+- New version
+- Considerably restructured for new source structure, but keeping the
+  same built packages
+
 * Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 4.3.5-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
 
diff --git a/sources b/sources
index 47ecf4d..79dfe38 100644
--- a/sources
+++ b/sources
@@ -1 +1,3 @@
-SHA512 (cube-4.3.5.tar.gz) = a9e407949588301c3d7c5f198222192ecc94cd2016dfaa2479b83d21e7f6df73a79059b1bc3f253578df90e92f6bba40fb9158c99337151ec58ffd852289ece3
+SHA512 (cubegui-4.4.tar.gz) = a956e90fa05ea0240e6b019b0d9b77c0c3c067aabbd97b979b8ff0631597fed655e846f0430ae98cbba8648575015073847b104501efa84361b588ecdca7d9b2
+SHA512 (cubelib-4.4.tar.gz) = bedf92a02d65645dbdc7eec17f7c74d674e70862f23ed8fea16d80209b1a72c8a6f6154455c5b2096014a2a93119be38e8fda31d380797860c52965e7d709d01
+SHA512 (cubew-4.4.tar.gz) = b55f7630890b19a4d2738b65d21377f96c48469708f89934851c338d23bd513c7561f3be0c23f847b56d807d94bced8b2676dc62e40eb36f5df052b11f81f9ba