step 1. removing command classes ant e.t.c
step 2. first step of refactoring was completed.
minor changes before merge into master