Solution reorganized in separate folder