Various cleanup and reorganizing, also automatic .desktop install