Modified structure of solutions and merge worksheet into project