Fixed WP7 controller + renamed namespace etc