Reorganised entire solution structure