Reworked the WP7 project.