Started refactoring the tool into the desktop project.