Directories restructured. Lots of desktop files edited.