Merge pull request #2 from amagrisso/master

synchronize directory structure