Reorganized the VS project files