Add header files and modularize dir
Merge pull request #3 from ianks/dir

Add header files and modularize dir