Merge pull request #2 from amagrisso/master

synchronize directory structure
Merge pull request #4 from amagrisso/pyhearth

Merge pull request #2 from amagrisso/master