[CUR-324] More refactoring and removing deps of removed files.
Merge pull request #2 from zdraganov/improvement-refactor-usage

[CUR-324] More refactoring and removing deps of removed files.