Bumping next version to 0.0.4
Making names consistent

Using _path rather than _dir for everything
Merge branch 'release/0.0.4'