Merge pull request #6 from mceloud/master

modify structure