Added proper interfaces + small refactor
Merge pull request #1 from ludwikkazmierczak/package-fix

Added proper interfaces + small refactor