use new recommended structure
fix according to new structure
Merge pull request #16 from louridas/master

use new recommended structure