Changed project structure to include solution

Also updated to the latest and greatest