Restructured desktop module to make it easier to read