Fitter initial restructure.
Fitter 1st restructure