Re-arrange source files
Merge pull request #25 from zucchini-src/rearrange_source

Re-arrange source files