refactored and added VS2010 project