Fixing broken build - SimAmp - cleanup and refactoring for dependencies

Integration of SimAmp classes, from closed into open branch somehow(?)
went wrong - I was too quick with cherry picking.