Better organization for more languages
Merge pull request #14 from joetech/reorganize

Better organization for more languages