Merge pull request #3309 from cra0zy/develop

gtk moved to Gtk folder, xwt removed