Restructure Graphics/Diagram subdir, rename modules