start of little refactoting
dependencies refactoring