Revert "Included unit in the solution"

This reverts commit 13a64026f23ae472531ac5514d522d5ba20d356b.
Revert "Included packages in the solution"

This reverts commit 45a8273dd30cdfd4daa100a616ac593ad7136ad7.