diff --git a/async/ASYNC.md b/ASYNC.md
similarity index 100%
rename from async/ASYNC.md
rename to ASYNC.md
diff --git a/plot/FPLOT.md b/FPLOT.md
similarity index 100%
rename from plot/FPLOT.md
rename to FPLOT.md
diff --git a/plot/fplot.py b/gui/core/fplot.py
similarity index 100%
rename from plot/fplot.py
rename to gui/core/fplot.py
diff --git a/nanogui.py b/gui/core/nanogui.py
similarity index 92%
rename from nanogui.py
rename to gui/core/nanogui.py
index 0ec58e6..f8889d7 100644
--- a/nanogui.py
+++ b/gui/core/nanogui.py
@@ -1,34 +1,15 @@
 # nanogui.py Displayable objects based on the Writer and CWriter classes
 # V0.3 Peter Hinch 26th Aug 2018
 
-# The MIT License (MIT)
-#
-# Copyright (c) 2018 Peter Hinch
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
+# Released under the MIT License (MIT). See LICENSE.
+# Copyright (c) 2018-2020 Peter Hinch
 
 # Base class for a displayable object. Subclasses must implement .show() and .value()
 # Has position, colors and border definition.
 # border: False no border None use bgcolor, int: treat as color
 
 import cmath
-from writer import Writer
+from gui.core.writer import Writer
 import framebuf
 import gc
 
diff --git a/aclock.py b/gui/demos/aclock.py
similarity index 100%
rename from aclock.py
rename to gui/demos/aclock.py
diff --git a/alevel.py b/gui/demos/alevel.py
similarity index 100%
rename from alevel.py
rename to gui/demos/alevel.py
diff --git a/async/asnano.py b/gui/demos/asnano.py
similarity index 100%
rename from async/asnano.py
rename to gui/demos/asnano.py
diff --git a/async/asnano_sync.py b/gui/demos/asnano_sync.py
similarity index 100%
rename from async/asnano_sync.py
rename to gui/demos/asnano_sync.py
diff --git a/plot/fpt.py b/gui/demos/fpt.py
similarity index 100%
rename from plot/fpt.py
rename to gui/demos/fpt.py
diff --git a/mono_test.py b/gui/demos/mono_test.py
similarity index 100%
rename from mono_test.py
rename to gui/demos/mono_test.py
diff --git a/plot/images/bernoulli.png b/plot/images/bernoulli.png
deleted file mode 100644
index d53f4b7..0000000
Binary files a/plot/images/bernoulli.png and /dev/null differ
diff --git a/plot/images/cartesian.png b/plot/images/cartesian.png
deleted file mode 100644
index 661b79c..0000000
Binary files a/plot/images/cartesian.png and /dev/null differ
diff --git a/plot/images/discont.png b/plot/images/discont.png
deleted file mode 100644
index 5190a8f..0000000
Binary files a/plot/images/discont.png and /dev/null differ
diff --git a/plot/images/lissajous.png b/plot/images/lissajous.png
deleted file mode 100644
index cf4ab11..0000000
Binary files a/plot/images/lissajous.png and /dev/null differ
diff --git a/plot/images/polar.png b/plot/images/polar.png
deleted file mode 100644
index 98a4273..0000000
Binary files a/plot/images/polar.png and /dev/null differ
diff --git a/plot/images/rtpolar.png b/plot/images/rtpolar.png
deleted file mode 100644
index 6e352d7..0000000
Binary files a/plot/images/rtpolar.png and /dev/null differ
diff --git a/plot/images/sine.png b/plot/images/sine.png
deleted file mode 100644
index 3453ec2..0000000
Binary files a/plot/images/sine.png and /dev/null differ