Changed directory structure.
Merge pull request #16 from chsw/Structure-change

Changed directory structure.