removed unnecessary classes
replaced some imports
replaced some imports
Merge pull request #4 from mashkovmax/bugfix

Bugfix