Adding files and VS solution
Cleanup some code in main