This reverts commit 012daa47d7.
012daa47d7
Files in cloonelgraphics could be further split, but this should be enough for the time being.