+ solution restructure, turned off old tests