Preparing major refactoring
Major refactoring, visual studio solution 2013