Reorganized folder structure for better usability

https://github.com/cferdinandi/kraken/issues/21
Updated version number
Merge branch 'v3.1-wip1'