Reorganized file for visual studio project.