Changed Filed directories

Re worked directories to work with a vs2010 solution file