[Desktop] Misc changes and re-structuring