- change namespace
- remove obsolete files
- fixing (?) dep
second part of work