Separated solutions and projects to fix compilation.