modularization part 1
Merge pull request #9 from orielsy/od-master

modularization part 1