Modularize Visual Studio Solutions

Created folders for Main and Testing