Cleaned solution for visual studio 2012
All together