Introduced stepper object.
Reorganized dependancies.