Added a new solution structure.
Removed unused file