More restructuring of the whole solution
appned to last commit