Desktop template re-organization