Changed packages in project
Merge pull request #3 from szagriichuk/refactoring

Changed packages in project