project restructure in visual studio
clean up