closes #5 Refactoring for milestone M1 finished.
closes #5 refactoring for this milestone closed.