Reorganized file hierarchy

Not totally in love with the new set up. But I think it is still
better than before.
Merge pull request #64 from eestrada/master

Reorganized file hierarchy