#145: Consistent directory name, and dependencies
Merge pull request #159 from jeff1evesque/consistent_dir_naming

#145: Consistent directory name, and dependencies