Refactored packages, created desktop build.xml