restructure also *.desktop file