use kwargs to init classes
retool the directory interactions
Merge pull request #13 from aweiteka/cleanup

Retool directory