Improve source file organization
Merge pull request #25 from scala/topic/source-file-org

Improve source file organization