Reorganize directory structure
Merge pull request #1 from keestux/master

Reorganize directory structure