Merge pull request #28 from mrkrstphr/refactoring-repos

refactoring repos