Solution reorganized in separate folder
Solution reorganized