Use Cmake to manage project instead of VS2010
Cleanup directory
Merge branch 'cmake'