Solution folder cleanup
Cleanup folder structure