Fixed .edmx

I have rearranged the edmx to make it more readable.

And I am warning you guys now, I am using Visual Studio 2012. It is pretty...go upgrade!