Simplify folder structure
Update examples, sln name.