Cleaning after vs2008 support removed

Split in multiple files are no more needed.
And removing code duplication...