Rewrite for desktop application to merge code-bases