Moving some files
More movings and refactories - will break the build when lower than 100% coverage
Merge pull request #26 from caarlos0/bug/mutiple-requests

Refactory