Fixes #135
We don't need to separate widget/onscreen from the main module, let's merge them together.