Merge pull request #64 from eestrada/master

Reorganized file hierarchy