Refactor the repo
Merge pull request #9 from scality/refactor_repo

Refactor the repo