Merge pull request #8 from orielsy/od-master

rename
modularization part 1